30 files changed, 158072 insertions, 82983 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index aecbf3743d..c023d90775 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Updated all the .po's for the release.
+
 2001-07-31  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian (bokm�l) translation.
diff --git a/po/az.po b/po/az.po
index d4630d17a2..276152b553 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-05-07 14:02+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-23 00:10GMT +0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -14,11 +14,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirən e'malatxana."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirir."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +36,7 @@ msgstr ""
 "\n"
 "Ad: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +44,7 @@ msgstr ""
 "\n"
 "  Prefiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +52,7 @@ msgstr ""
 "\n"
 "  Verilən:\t"
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +60,7 @@ msgstr ""
 "\n"
 "  Əlavə: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +68,7 @@ msgstr ""
 "\n"
 "  Ailə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +76,7 @@ msgstr ""
 "\n"
 "  Suffiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +84,7 @@ msgstr ""
 "\n"
 "Ad günü:  "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +92,7 @@ msgstr ""
 "\n"
 "Ünvan:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +100,7 @@ msgstr ""
 "\n"
 "   Poçt Qutusu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +108,7 @@ msgstr ""
 "\n"
 "   Əlavə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +116,7 @@ msgstr ""
 "\n"
 "   Küçə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +124,7 @@ msgstr ""
 "\n"
 "   Şəhər:\t"
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +132,7 @@ msgstr ""
 "\n"
 "   Rayon:\t"
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +140,7 @@ msgstr ""
 "\n"
 "   Poçt Kodu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +148,7 @@ msgstr ""
 "\n"
 "   Ölkə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +156,7 @@ msgstr ""
 "\n"
 "Təslim Etiketi:  "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +164,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +172,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +180,7 @@ msgstr ""
 "\n"
 "ePoçt:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +188,7 @@ msgstr ""
 "\n"
 "ePoçt:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +196,7 @@ msgstr ""
 "\n"
 "Göndərici:  "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +204,7 @@ msgstr ""
 "\n"
 "Zaman zolağı:  "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +212,7 @@ msgstr ""
 "\n"
 "Coğrafi Yerləşmə:  "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +220,7 @@ msgstr ""
 "\n"
 "Məslək:\t"
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +228,7 @@ msgstr ""
 "\n"
 "Quruluş:\t"
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +236,7 @@ msgstr ""
 "\n"
 "   Ad:\t"
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +244,7 @@ msgstr ""
 "\n"
 "   Bölmə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +252,7 @@ msgstr ""
 "\n"
 "   Bölmə2:\t"
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +260,7 @@ msgstr ""
 "\n"
 "   Bölmə3:\t"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +268,7 @@ msgstr ""
 "\n"
 "   Bölmə4:\t"
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +276,7 @@ msgstr ""
 "\n"
 "Kateqoriyalar:\t"
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +294,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +302,7 @@ msgstr ""
 "\n"
 "Yeganə Kəlimə:\t"
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -300,27 +310,25 @@ msgstr ""
 "\n"
 "Ümumi Açar:\t"
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirən e'malatxana."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Çoxlu İsmarıc"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "'GnomeCard' fayllarını 'Evolution' içinə gətirir."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "%s üçün parol girin"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
@@ -333,14 +341,14 @@ msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Wombat xidməti başladıla bilmədi"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
 
@@ -349,725 +357,845 @@ msgstr "Wombatı başlada bilmədim"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Bonobonun ünvan nümayiş etdirmə vasitəsi."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Bonobonun ünvan nümayiş etdirmə  vasitəsi."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Ünvan dəftəri göstərən nümunəvi Bonobo idarəsi."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution ünvan dəftəri kiçik kartlarını göstərən idarə."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Əlaqələri idarə edici 'Evolution' əlavəsi."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "'Evolution'un Ünvan Dəftəri Kiçik Kart e'malatxanası"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Ünvan Dəftəriidə ünvan göstərici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Ünvan Dəftərində ünvan göstərici e'malatxanası"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "'Evolution'un Ünvan Dəftəri e'malatxanası."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Nümunəvi ünvan dəftəri idarəsi e'malatxanası"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Vericisi"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fayl"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Namə'lum ünvan dəftəri"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Heç biri (adsız halı)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Parol"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Namə'lum tanıtma növü"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Əsas"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Bir"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Alt Ağac"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Namə'lum hərəkət növü"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Cild DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIZME DN Kömək Mətnini bura cala"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Bu parolu yadda saxla"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Ev Sahibi:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Yuva kömək mwtni burada."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Kök DN :"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Kök Dn kömək mətni burda."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Qapı:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Qapı kömək mətni burda."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Axtarış Hərəkəti ..."
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Tanıtma :"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Yol:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Cığır Kömək mətni burda."
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Belə bir yol yoxdursa yarat."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Ünvan dəftərini düzəlt"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Ünvan dəftəri əlavə et"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Sahib olduğunuz ünvan dəftəri nçvünü seçin, bunu haqqında lazımi "
+"mə'lumatları bildirin."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Ad :"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Ad kömək mətbi burda."
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "İzah :"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME İzah kömək mətbi burda."
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Əlavə Et"
+msgid "Addressbook Sources"
+msgstr "Ünvan Dəftəri Qaynağı"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Ad"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Əlavə Et"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Düzəlt"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Digər Əlaqələr"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s üçün parol girin"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Ünvan dəftərini aça bilmədim"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Daxil edən hər hansı üzv"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Ad daxil edən"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "ePoçt daxil edən"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Ad daxil edən"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Qovluq Səyyahını göstərəcək olan URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "İlk ePoçt ünvanı"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "2.nci ePoçt ünvanı"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "3.ncü ePoçt ünvanı"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Fayl seç"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir hesab yarat"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Ünvan dəftərini düzəlt"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Əlaqə Mə'lumatını Düzəlt"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Əlaqələrə Əlavə Et"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "ePoçt Ünvanı: "
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Sorğuları Bağla"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+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:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Hamısını Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "E-poçt Göndərilir"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Digər Əlaqələr"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Alıcılar Siyahısı :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Ad Seç"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Adı buradan seç:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Kateqoriyalar:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "A_xtar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_İl dönümü :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Məslək"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Məsləki _Faks"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Əlaqələr ..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Nö_vlər..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Əlaqə düzəldicisi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Ətraflı"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Fərqli fayllalə:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Yeni telefon növü"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Qeydlər:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Orqanizasiya"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefon Növləri"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "İlk ePoçt ünvanı"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML ePoçtlarını qəbul edir"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Web səhifəsi :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Əlavə Et"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Ünvan..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Köməkçi adı :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Ad günü :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Məslək"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "Ş_irkət :"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Əlaqələr ..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:639 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Bölmə :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Tam Ad ..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Məslək _izahı:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_İdarəcinin Adı :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Cib"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Ləqəb :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_İdarə :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Məslək :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Yoldaş:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Əlaqəni Silimmi?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Köməkçi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Məslək"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "2.nci Məslək"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Məsləki Faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Geri axtarma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Maşın"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Şirkət"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Ev faksı"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Cib telefonu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Başqa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Başqa faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Peycer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "İlk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "2.nci ePoçt ünvanı"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "3.ncü ePoçt ünvanı"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Əlaqəni Silimmi?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Hamısını Düzəlt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "ePoçt"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Ünvan _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Ünvanı Yoxla"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Öl_kə:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "ABŞ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Ünvan :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Şəhər:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Poçt Qutusu:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Vilayət"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP Kodu:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tam adı yoxla"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Ad :"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Soyad :"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Orta ad:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "B_aşlıq:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "_Balaca kartlar olaraq"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "_Cədvəl olaraq"
-
-#: addressbook/gui/component/addressbook.c:407
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s üçün parol girin"
-
-#: addressbook/gui/component/addressbook.c:435
-msgid "Unable to open addressbook"
-msgstr "Ünvan dəftərini aça bilmədim"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Bu ünvan dəftərini aça bilmədik. Bu ya səhv bir\n"
-"URI'nin bildirilməsindən ötrü ya da LDAP dəstəyi \n"
-"olmayan bir vericiyə çatmaq istəməsindən ötrüdür.\n"
-"Bir URI bildirdin isə, URI'nin düz olduğunu yoxla və\n"
-"yenə sına. Bir URI bildirimədin isə, bir LDAP vericisinə\n"
-"çatmaq istədin. LDAp'ı istifadə etmək istəyirsənsə , OpenLDAPi(ı)\n"
-"qurub, Evolution'u yenidən yoxlayıb yenidən qurmaq "
-"məcburiyyətindəsən.\n"
-
-#: addressbook/gui/component/addressbook.c:563 widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Hamısını Göstər"
-
-#: addressbook/gui/component/addressbook.c:565 widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Ətraflı..."
-
-#: addressbook/gui/component/addressbook.c:595 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Daxil edən hər hansı üzv"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Name contains"
-msgstr "Ad daxil edən"
-
-#: addressbook/gui/component/addressbook.c:597
-msgid "Email contains"
-msgstr "ePoçt daxil edən"
-
-#: addressbook/gui/component/addressbook.c:740
-msgid "The URI that the Folder Browser will display"
-msgstr "Qovluq Səyyahını göstərəcək olan URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Vericisi"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fayl"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Namə'lum ünvan dəftəri"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Heç biri (adsız halı)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Parol"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Namə'lum tanıtma növü"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Əsas"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Bir"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Alt Ağac"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Namə'lum hərəkət növü"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Cild DN:"
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr "FIZME DN Kömək Mətnini bura cala"
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Bu parolu yadda saxla"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Ev Sahibi:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr "FIXME Yuva kömək mwtni burada."
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Qapı:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Fayl adı :"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "FIXME Qapı kömək mətni burda."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Dekabr"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Kök DN :"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Kök Dn kömək mətni burda."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Axtarış Hərəkəti ..."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Tanıtma :"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Əlaqə düzəldicisi"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Yol:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Əlaqə düzəldicisi"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr "FIXME Cığır Kömək mətni burda."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Belə bir yol yoxdursa yarat."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Ünvan dəftərini düzəlt"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Ünvan dəftəri əlavə et"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Sahib olduğunuz ünvan dəftəri nçvünü seçin, bunu haqqında lazımi "
-"mə'lumatları bildirin."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Ad :"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr "FIXME Ad kömək mətbi burda."
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "İzah :"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr "FIXME İzah kömək mətbi burda."
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Ünvan Dəftəri Qaynağı"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Düzəlt"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Ad"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Sorğuları Bağla"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Əlaqə Mə'lumatını Düzəlt"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Əlaqələrə Əlavə Et"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Bonobonun ünvan nümayiş etdirmə vasitəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobonun ünvan nümayiş etdirmə  vasitəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Ünvan dəftəri göstərən nümunəvi Bonobo idarəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution ünvan dəftəri kiçik kartlarını göstərən idarə."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Əlaqələri idarə edici 'Evolution' əlavəsi."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "'Evolution'un Ünvan Dəftəri Kiçik Kart e'malatxanası"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Ünvan Dəftəriidə ünvan göstərici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Ünvan Dəftərində ünvan göstərici e'malatxanası"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "'Evolution'un Ünvan Dəftəri e'malatxanası."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Nümunəvi ünvan dəftəri idarəsi e'malatxanası"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Sil"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Hamısını Sil"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-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/select-names.glade.h:1
-msgid "Find..."
-msgstr "Tap..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Alıcılar Siyahısı :"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Ad Seç"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Adı buradan seç:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Axtar"
 
@@ -1179,156 +1307,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Əlaqəni başqasına göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Əlaqəyə yeni bir ismarıc göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "%s yüklənərkən xəta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Qaynaqlar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Namə'lum xəta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Xətdən Qopuq İşlə"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Qadağandır"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Fayl tapıla bilmədi"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Əməliyyat dəstəklənmir"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Ləğv Edildi"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "G/Ç xətası"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s yüklənərkən xəta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "%s yüklənərkən xəta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "%s yüklənərkən xəta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, 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:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+" Data oxunarkən xəta oldu:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Fərqli faylla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "ePoçt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Əsas Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Köməkçi Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Geri axtarma Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Şirkət"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "İş Ünvanı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Ev Ünvanı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Əl Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "2.nci İş Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "2.nci Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Digər Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "BaşqaÜnvanlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Web Səhifəsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Bölmə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "İdarə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Başlıq"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Məslək"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "İdarəci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Ləqəb"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Yoldaş"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Sərbəst/məşğul URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Qurtardı"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Təqvim yüklənir..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Ünvan dəftərinə qeyd et"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1371,7 +1597,8 @@ msgid "Dimensions:"
 msgstr "Ölçülər :"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Yazı növü ..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1431,7 +1658,6 @@ msgid "Margins"
 msgstr "Kənarlar"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Sütunların miqdarı :"
 
@@ -1511,37 +1737,62 @@ msgstr "Növ:"
 msgid "Width:"
 msgstr "En :"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Yazı növü ..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 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:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "İclas bildiricisi "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Təqvim göstərən Bonobo idarə nümunəsi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Mürgülə"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolutionun İcracı mündəricat parçası."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Oldu"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "'Evolution'un Təqvim əlavəsi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+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
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolutionun təqvim parçasının mərkəzi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+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:8
+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:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolutionun təqvim parçasının mərkəzi."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1551,7 +1802,92 @@ msgstr "Alarm vermə xidməti"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm vermə xidməti e'malatxanası"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "\"Evolution\" haqqında mə'lumat göstər"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%A %b %d %Y %H:%M'də bildir"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Qapat"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Mürgülə"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "İclası düzəlt"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Mündəricat yoxdur."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "İclas bildiricisi "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Mürgülə"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Oldu"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
@@ -1560,134 +1896,164 @@ msgstr ""
 "Bu, %s dir(dır).  İndiki Unix vaxtı da %ld dir(dır). Bəlkə bilmək "
 "istəyərsinizdeyə fikirləşdik."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOME başladıla bilmədi"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonoboyu başlada bilmədim"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti e'malatxanası yaradıla bilmir"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Fayl tapıla bilmədi"
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Təqvimi aç"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Təqvimi qeyd et"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:586
+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:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Ümumi"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Namə'lum"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:691
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Yüksək"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Alçaq"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Şəffaf"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1698,22 +2064,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
-msgid "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr "Siniflədirmə 'Ümumi', 'Xüsusi', 'Gizli' ya da 'Heç Biri' olmalıdır"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+"Siniflədirmə 'Ümumi', 'Xüsusi', 'Gizli' ya da 'Heç Biri' olmalıdır"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1723,116 +2095,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 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"
+msgstr ""
+"Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Üstünlük 'Yüksək', 'Normal', 'Alçaq' və ya 'Təsvirsiz' ola bilər."
+msgstr ""
+"Üstünlük 'Yüksək', 'Normal', 'Alçaq' və ya 'Təsvirsiz' ola bilər."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "Şəffaflıq 'Şəffaf', 'İşıq Keçirməz' və ya 'Heç Biri' olmalıdır."
+msgstr ""
+"Şəffaflıq 'Şəffaf', 'İşıq Keçirməz' və ya 'Heç Biri' olmalıdır."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Xeyr"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Kart Nümayişi "
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Görüşlər"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "İ_ş  həftəsi"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Görünüşləri Müəyyənləşdir"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Vəzifə"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Ay"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Təqvim yükləmə xətası</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "Təqvimin göstərəcəyi URI"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Təqvim yükləmə xətası:<br>Bu yol dəstəklanmir"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Səsli Alarmlar"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Ekran"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Alıcılar Siyahısı :"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Görüşləri göstər"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Göstərmə Seçənəkləri :"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Vəzifələri göstər"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Ediləcəklər"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Təqvim yüklənir"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "Təqvimin göstərəcəyi URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M'də bildir"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "İsmarıc saxlanması"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Səs çal"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Mündəricat yoxdur."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Qapat"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Proqramı işə sal"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "İclası düzəlt"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "gün"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Güncəlləməlri hər "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "dəqiqə"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d gün"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "1 gün"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "%d həftə"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "2 həftə"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "%d saat"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "1 saat"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "%d dəqiqə"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "1 dəqiqə"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "%d saniyə"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr "1 saniyə"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Səs çal"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Bütün ismarıc başlıqlarını göstər"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "ePoçt göndər"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Proqramı işə sal"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "iclasın başlanğıcından əvvəl"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "iclasın başlanğıcından sonra"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "iclas qurtarandan əvvəl"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "iclas qurtarandan sonra"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Əsas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Tarix və Vaxt"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Xatırladıcılar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Mündəricat:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Seçənəklər"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "sonra"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "əvvəl"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "gün(lər)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "görüşün sonu"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "dəqiqə"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "iclasın başlanğıcı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1863,36 +2414,38 @@ msgid "60 minutes"
 msgstr "60 dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Zınqırovun səs kəsilməsi müddəti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Səsli Alarmlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Alarm pəncərəsi çıxanda biiplə."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Təqvim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Təqvim Seçənəkləri"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Rənglər"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Həftə sonlarını sıxışdır"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Tarix səyyahı xüsusiyyətləri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1900,583 +2453,1085 @@ msgid "Defaults"
 msgstr "Əsaslar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Göstərmə Seçənəkləri :"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Ekran"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Uyğun Tarix"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Xəbardarlığı Fəallaşdır"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Gün sonu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Həftənin ilk günü:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Cüm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Cümə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "İşarətlə"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Bügunki İşlər"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Bügunkü İşlər:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Hələ Bitirilməmiş İşlər"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Hələ Bitirilməmiş İşlər:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "B.e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Vaxtı Keçmiş İşlər"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Vaxtı Keçmiş İşlər:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Rəng al"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Üstünlük"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Vaxtı Keçmiş İşlər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Bütün Görüşlərimi Bildir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Xatırladıcılar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Şn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Şənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Göstər"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Görüşlərin sonlanma tarixini göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Həftə Sayısını göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Gübüb başlanğıcı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Baz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Bazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Vəzifə Taxtası"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Vəzifə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Bügunki İşlər"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "C.a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Keçməsinə qədər qalan vaxt"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Başlıq"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Vaxt Dilimləri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Vaxt Şəkli:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Zaman zolağı:  "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Ç.a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Göstərişli Xəbərdarlıqlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Çər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "İş Həftəsi"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "İ_ş  həftəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "dəqiqə əvvəlində onlar meydana çıxırlar."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "saniyə."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, 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
+#, 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/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, 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
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Bitirmə Tarixi"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Bitirmə Tarixi"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Uyğun Tarix"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "İclası düzəlt"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "İclas - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Vəzifə - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Jurnal üzvü - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Mündəricat yoxdur"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Faylının üsütünə yazım mı?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eyni adlı bir fayl onsuz da vardır.\n"
+"Üstünə yazım mı?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Fərqli Qeyd Et ..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 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:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, 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:91
+#: calendar/gui/dialogs/delete-comp.c:105
 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/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, 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/task-editor.c:707
-msgid "Edit Task"
-msgstr "Vəzifəni Düzəlt"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, 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/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Mündəricat yoxdur"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, 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?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "İclas - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fayl seç"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Vəzifə - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Bölmələr :"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Jurnal üzvü - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zaman zolağı:  "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% _Qurtardı:"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "İclas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Xatırladıcı"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Təkrarlama"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Görüşü Ləğv Et"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Günün bü_tün hadisələri"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Sinifləndirmələr"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Tarix və Vaxt"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Bitirmə Tarixi:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Xü_susi"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Gedişat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Üm_umi"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Başla_ma Tarixi:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Mü_ndəricat:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Vəzifə"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Gizli"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Əlaqələr ..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "_Sonlanma vaxtı:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Bu tarixə qədər :"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Başlama vaxt:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Üstünlük:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Hal:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Qrup adı :"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Kateqoriyalar"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kağız qaynağı :"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Stul"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Lazımi İştirakçılar"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Ehtiyatdakı İştirakçılar"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Qeyri İştirakçılar"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Gediş əlavə et"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Qəbul Et"
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Rədd Et"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Girişimli"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Silinən"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "İşləyir"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Maşın Telefonu"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Lazımi İştirakçılar"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Ehtiyatdakı İştirakçılar"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Qeyri İştirakçılar"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Göndərildi"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Sil..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Ziyarətçilər"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Son Tarix"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Silinən"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Başlama Tarixi"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Silinən"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Çoğrafi Yerləşmə"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "İdarəci"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Faiz Qurtardı"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Dekabr"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Mündəricat"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Şəffaf"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rolu"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Hal"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarm"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Növ"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Vəzifə əlavə etmək üçün buraya tıqla"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Təşkilatçı:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Təşkilatçı:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Başqalarını _Dəvət Et ..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Təşkilatçı:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+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:938
+msgid "on"
+msgstr "..da"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "gün"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "...da (də)"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "hadisələr"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Xüsusi təkrarlama"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Hər"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Xaric Tutulan"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Təkrarlama yoxudr"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Nümayiş"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Təkralama Qaydası"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Bəsit Təkrarlama"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Düzəlts"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "üçün"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "həmişə"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "ay"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "qədər"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "həftə"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Bitirmə Tarixi:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Silinən"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Silinən"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Yoxdur"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Vəzifə"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% _Qurtardı:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Gedişat"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Başla_ma Tarixi:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Bu tarixə qədər :"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Üstünlük:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Hal:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "İşarətləmə qurtadı"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Vəzifə qurtarmasını işarətlə"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "Bu vəzifəni düzəlt ..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Köçürt"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Vəzifəni Düzəlt"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "İşarətləmə qurtadı"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Vəzifəni sil"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "İşarətləmə qurtadı"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Bu vəzifəni sil"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Vəzifə əlavə etmək üçün buraya tıqla"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% _Qurtardı:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kateqoriyalar"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Qurtar"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Qurtarma Vaxtı"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Uyğun Tarix"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Son Tarix"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Çoğrafi Yerləşmə"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Üstünlük"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Başlama Tarixi"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Mündəricat"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Vəzifə"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Şəffaf"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %b %d"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün Hadisələri"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Günə Get"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Tarixə Get..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Aç"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Bu İclası sil"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Görüş Cədvəli"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Bu hadisənin daşına bilməsinə imkan ver"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Bu Hadisəni sil"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Bütün Hadisələri sil"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Bütün Hadisələri Sil"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dəqiqə bölmələri"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Təqvim faylını güncəlləyə bilmirəm!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Bu ePoçt ünvanıdır"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Komponenet müvəffəqiyyətlə güncəlləndi."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Təqvim faylı yüklənərkən xəta oldu."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Təqvim faylını aça bilmirəm!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Təqvim faylını yükləyə bilmirəm!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Təqvim faylını oxuya bilmirəm!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Bu ismarıc hazırda mövcuddur"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Bu, dəvət edilməmiş biri tərəfindən verilən cavabdır!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Təqvim mə'lumatlarını güncəlləyə bilmirəm."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Təqvim komponenetini silə bilmirəm!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Komponenet müvəffəqiyyətlə silindi."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Bu cür təqvim parçasından başım çıxmır."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Təqvimə Əlavə Et"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Qəbul Et"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Rədd Et"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+#, 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:816
-msgid " Tentative "
-msgstr " Girişimli"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Təqvimi Güncəllə"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Görüşü Ləğv Et"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Təqvim faylını güncəlləyə bilmirəm!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, 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.glade.h:2
 #, no-c-format
@@ -2491,26 +3546,22 @@ msgstr "-- --"
 msgid "Calendar Message"
 msgstr "Təqvim İsmarıcı"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Tarix:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Təqvim yüklənir"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Təqvim yüklənir..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Təşkilatçı:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Verici İsmarıcı:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Mündəricat:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "bitiş tarixi"
@@ -2519,418 +3570,48 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Ziyarətçilər"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Ziyarətçilərin ünvanları"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Ziyarətçilər:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Görüşü\n"
-"Ləğv Et"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Stul"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Görüş Dəvətləri"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Qeyri İştirakçılar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Ehtiyatdakı İştirakçılar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Təşkilatçı:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Hadisəni\n"
-"Dərc Et"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Görüş\n"
-"İstə"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "Lazımi İştirakçılar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rolu"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Vaxt\n"
-"Planlaşdır"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1083
-msgid "Status"
-msgstr "Hal"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Hamısı"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kateqoriyalar:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, 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:310
+#: calendar/gui/e-tasks.c:415
 #, 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/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "İclası düzəlt"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "..da"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "gün"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "...da (də)"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "hadisələr"
-
-#: calendar/gui/event-editor.c:876
-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/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d gün"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr "1 gün"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr "%d həftə"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr "2 həftə"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr "%d saat"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr "1 saat"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr "%d dəqiqə"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr "1 dəqiqə"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr "%d saniyə"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr "1 saniyə"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Səs çal"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Dialoqu göstər"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "ePoçt göndər"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Proqramı işə sal"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr "iclasın başlanğıcından əvvəl"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr "iclasın başlanğıcından sonra"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr "iclas qurtarandan əvvəl"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr "iclas qurtarandan sonra"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Günün bü_tün hadisələri"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "İclas"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Görüş Əsasları"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Xüsusi təkrarlama"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Hər"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Xaric Tutulan"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Düzəlts"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Təkrarlama yoxudr"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Nümayiş"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Təkrarlama"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Təkralama Qaydası"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Xatırladıcı"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Qurğular..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Bəsit Təkrarlama"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Sonlanma vaxtı:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Başlama vaxt:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Başlama Tarixi"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "sonra"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "əvvəl"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "gün(lər)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "görüşün sonu"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "üçün"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "həmişə"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "saat"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "dəqiqə"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "ay"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "iclasın başlanğıcı"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "qədər"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "həftə"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "il"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Yeni İclas ..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Bütün Hadisələri Sil"
-
 #. 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Hamısını Göstər"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Xülasə daxil edən"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "İzah daxil edən"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Şərh daxil edən"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Kateqoriyaya sahib olan"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Yeni İclas ..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, 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_Evolution_Calendar.oaf.in.h:1
-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:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutionun İcracı mündəricat parçası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "'Evolution'un Təqvim əlavəsi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-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
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolutionun təqvim parçasının mərkəzi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-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:8
-msgid "Factory for the sample Calendar control"
-msgstr "Nümunəvi Təqvim idarəsi e'malaxanası"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -2952,232 +3633,256 @@ msgid "Go To Date"
 msgstr "Tarixə Get"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Günə Get"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Yanvars"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "İyul"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "İyun"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "May"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Noyabr"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Oktyabr"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Günə Get"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3.ncü"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4.ncü"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6.ncı"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9.ncu"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13.ncü"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14.ncü"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16.ncı"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23.ncü"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24.ncü"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26.ncı"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ç.a"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Şn"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Vəzifə"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Hazırkı gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Hazırkı həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Hazırkı ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Hazırkı il ( %Y )"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Bu üzvü çap et"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Çap Qurğuları"
+
+#: 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"
 
@@ -3223,80 +3928,100 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "BBeÇaÇCaCŞ"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Bu qeydlərdə müəyyənləşdirilən imzalama növü dəstəklənmir"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu qeydlərdə təsdiqləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifrləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarıcı alınır"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarıc %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "İsmarıc açıla bilmir"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Qurtar"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, 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:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, 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:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
@@ -3332,14 +4057,33 @@ msgstr "Namə'lum başlıqda sorǧu aparılır: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Cismdə hökmsüz yazı, kəlimə xaric"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yaradıla bilmədi: %s"
+
+#: camel/camel-lock-client.c:123
+#, 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
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3349,120 +4093,117 @@ msgstr ""
 #: camel/camel-lock.c:201
 #, 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"
+msgstr ""
+"fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s"
 
 #: camel/camel-lock.c:255
 #, 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"
+msgstr ""
+"fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s məktub faylı yoxlana bilmir: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "%s məktub faylı açıla bilmir: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, 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:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s üçün qıfıl faylı sınana bilmədi: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Məktub faylı oxunma xətası: %s"
-
-#: camel/camel-movemail.c:256
-#, 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:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaradıla bilmədi: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Çəngəllənə bilmədi: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Məktub daşıma proqramı iflas etdi: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Namə'lum xəta)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Məktub faylı oxunma xətası: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, 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:188
+#: camel/camel-pgp-context.c:193
 #, 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:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Lütfən %s parol kəlimənizi girin"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "İmzalanacaq düz mətn yoxdur."
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Parol verilməyib."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Təmiz imza mətni yoxdur."
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Təsdiqlənəcək düz mətn yoxdur."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Müvəqqəti fayl yaradıla bilmir: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Şifrlənəcək mətn yoxdur."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Alıcı bildirilməyib"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Şifri açılacaq mətn yoxdur."
 
@@ -3481,37 +4222,37 @@ msgstr "%s yüklənə bilmədi: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yüklənə bilmir: Modulda başlatma kodu yoxdur."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s verici %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s üstündə %s üçün %s xidmətləri"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(namə'lum ev sahibi)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi"
 
@@ -3521,7 +4262,8 @@ msgstr "Adsız"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Bu seçənəklə siz vericisiyə adsız olaraq bağlana biləcəksiniz."
+msgstr ""
+"Bu seçənəklə siz vericisiyə adsız olaraq bağlana biləcəksiniz."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -3622,7 +4364,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -3632,7 +4374,8 @@ msgstr "NT Giriş"
 
 #: 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 "Bu seçənəklə siz vericisiyə sadə parol ilə bağlana biləcəksiniz."
+msgstr ""
+"Bu seçənəklə siz vericisiyə sadə parol ilə bağlana biləcəksiniz."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -3684,14 +4427,15 @@ msgstr "_Virtual Qovluq Sehirbazı ..."
 
 #: camel/camel-session.c:70
 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"
+msgstr ""
+"Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3700,33 +4444,53 @@ msgstr ""
 "%s qovluğunu yarada bilmədim:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Zibil Qutusu"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "%s üçün %s parol kalimanizi lürfən girin"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Belə bir fayl yoxdur ."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Belə bir fayl yoxdur ."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Bacarılmayan İsmarıc %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"ePoçt: %s\n"
-"Ümumə Ad: %s\n"
-"Quruluş Vahidi: %s\n"
-"Quruluş: %s\n"
-"Yer: %s\n"
-"Əyalət: %s\n"
-"Ölkə: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3741,17 +4505,36 @@ msgstr ""
 "\n"
 "Yenə də qəbul etmək istəyirsiniz?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"ePoçt: %s\n"
+"Ümumə Ad: %s\n"
+"Quruluş Vahidi: %s\n"
+"Quruluş: %s\n"
+"Yer: %s\n"
+"Əyalət: %s\n"
+"Ölkə: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarıc yoxdur"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Bele bir ismarıc yoxdur: %s"
@@ -3760,64 +4543,75 @@ msgstr "Bele bir ismarıc yoxdur: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Buradakı ismarıcları zibilə göndərə bilməzsiniz."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz cavab alındı: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Namə'lum xəta"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP vericisi cavabı %s mə'lumatını daxil etmir"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 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:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, 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:362
-msgid "Scanning IMAP folder"
-msgstr "IMAP qovluğu daranır"
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "İsmarıclar qeyd edilir"
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Bu ismarıc hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "İsmarıclar qeyd edilir"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 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-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Yeni ePoçt üçün baxılır"
 
@@ -3825,7 +4619,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:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -3851,7 +4645,8 @@ msgstr "IMAPv4"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
+msgstr ""
+"IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -3859,28 +4654,28 @@ 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:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:464
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, 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:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:503
-#: camel/providers/smtp/camel-smtp-transport.c:402
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3891,36 +4686,54 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
-msgstr "Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün"
+msgstr ""
+"Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standart UNIX məktub qutusu faylı"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Standart mbox şəklindəki məktubların saxlanması üçün"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
-msgstr "Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
+msgstr ""
+"Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
+
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+"Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
@@ -3960,24 +4773,24 @@ msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 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:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, 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:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3986,18 +4799,19 @@ msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Belə bir ismarıc yoxdur"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarıc mövtəviyyatı"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4007,14 +4821,14 @@ msgstr ""
 "`%s' qovluğu açıla bilmir: \n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4024,22 +4838,29 @@ msgstr ""
 "`%s' qovluğu yaradıla bilmədi:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' məktub qovluğu faylı deyildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "məktub qovluğu faylı deyildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"`%s' qovluğu yaradıla bilmədi:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4047,11 +4868,13 @@ 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:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
@@ -4061,9 +4884,12 @@ msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 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:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4072,11 +4898,13 @@ msgstr ""
 "İsmarıc alına bilmir: %s qovluğundan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 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:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
@@ -4122,36 +4950,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Qovluq Cəmləşdirilir"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Qovluq açıla bilmir: %s:%ld yerindən yığcamlaşdırılır: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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-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-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Qovluq sinxronlaşdırılır"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Qovluq toplanmaq üçün açıla bilmir: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
@@ -4160,23 +4997,30 @@ msgstr "Müvəqqəti məktub qutusu açıla bilmir: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 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:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, 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:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
@@ -4191,13 +5035,14 @@ msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Namə'lum xəta: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh qovluğuna ismarıc əlavə edilə bilmir: %s: %s"
@@ -4212,39 +5057,93 @@ 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:465
+#, 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:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' normal bir fayl deyildir ."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "`%s' faylı yoxdur ."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "%s Yeli məktub faylı"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, 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:817
+#, 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:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Verici istifadəçi adını qəbul etmədi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Vericiyə istifadəçi adı göndərilə bilmədi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Verici istifadəçi adını/parolunu qəbul etmədi"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "%s ismarıcı tapıla bilmədi"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Vericidən qrup adı öyrənilə bilmədi."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s üçün qrup faylı qeyd edilə bilmir: %s"
@@ -4259,17 +5158,17 @@ 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:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s dan(dən) USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4277,8 +5176,8 @@ 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:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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"
@@ -4329,7 +5228,7 @@ msgstr "İsmarıcları Vericidə burax"
 msgid "Delete after %s day(s)"
 msgstr "%s gün sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4361,7 +5260,8 @@ msgstr ""
 "bütün istifadəçilər üçün dəstəklənməz."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+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."
@@ -4423,7 +5323,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4455,7 +5355,8 @@ msgstr "İsmarıc göndərilə bilmədi: %s"
 #: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, 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."
+msgstr ""
+"sendmail %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
@@ -4479,7 +5380,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4489,122 +5390,123 @@ 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:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xətası, əmr tanınmır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr və ya arqumentlərdə sintaksis xətası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Əmr qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Əmr parametri qəbul edilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Kömək İsmarıcı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Xidmət hazırdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Xidmət nəqliyyat kanallarını bağlayır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 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:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
-msgstr "İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
+msgstr ""
+"İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 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:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Nəqliyyat bacarılmadı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Parol nəqli lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Tanıtma mexanizması çox zəifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 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:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Müvəqqəti tanıtma iflası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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:387
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:410
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4615,321 +5517,241 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, 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:553
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
-msgstr "İsmarıc göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
+msgstr ""
+"İsmarıc göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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."
+msgstr ""
+"İsmarıc göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "İsmarıc göndərilir"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 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:668
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:687
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:720
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:735
-#: camel/providers/smtp/camel-smtp-transport.c:747
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Tanıtma"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:797
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "AUTH istək vaxt dolması. %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 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:823
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:842
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:867
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:886
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:917
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:936
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:951
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:988
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, 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:1073
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, 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:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Bir fayl yapışdır"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 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:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "İsmarıca bir fayl əlavə et"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1083
-msgid "Attachment"
-msgstr "Yapışdırılmış fayl"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Yapışdırılmış fayl xüsusiyyətləri"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Fayl adı :"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Daxili yapışdırma"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME növü:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Fərqli göndər:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"%s imza faylı açıla bilmədi:\n"
-"%s"
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "Fərqli qeyd et ..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fayl qeyd edərkən xəta oldu: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fayl yüklərkən xəta oldu: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-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:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu ismarıc göndərilə bilmədi.\n"
-"\n"
-"Dəyişiklikləri qeyd etmak istəyirsiniz?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Faylı aç"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Belə bir fayl yoxdur ."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Bu normal bir fayl deyildir ."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Bu fayl vardır amma oxuna bilən deyildir ."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-"Bu fayl əl çatıla biləndi dəyəsən amma open(2)-çağırışı iflas "
-"etdi ."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Bu fayl çox böyükdür ( 100 KB'dən böyük ! ) .\n"
-"Bu faylı daxil etmək istəyirsanmi?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "Faylı oxurkən bir xəta oldu ."
 
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Bir ismarıc yaz"
-
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
-msgstr "Dialoq qutusunu yarada bilmədim ."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "İsmarıcın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 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:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4937,7 +5759,137 @@ msgstr ""
 "İsmarıcın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar "
 "özlərini ismarıcın göndərildiği adamlar arasında görməyəcəkdir ."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir fayl yapışdır"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"`%s' Faylı açıla bilmir:\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, 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:873
+msgid "Save as..."
+msgstr "Fərqli qeyd et ..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Xəbərdarlıq"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Fayl yüklərkən xəta oldu: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+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:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Fayl qeyd edərkən xəta oldu: %s"
+
+#: composer/e-msg-composer.c:1055
+#, 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:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nəticə faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Nəticə faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"İsmarıcların buraya qeyd edilmə xatası: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution Pine məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ismarıc göndərilə bilmədi.\n"
+"\n"
+"Dəyişiklikləri qeyd etmak istəyirsiniz?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Faylı aç"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "_Mətn faylını daxil et ... "
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Bir ismarıc yaz"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Dialoq qutusunu yarada bilmədim ."
+
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4946,7 +5898,7 @@ msgstr ""
 "parçasındakı\n"
 "heç bir qurǧulari, aparmamısınız."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutionun ePoçt yazma parçasını başlada bilmədim ."
 
@@ -4963,36 +5915,56 @@ msgid "calendar information"
 msgstr "təqvim haqqında"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5000,271 +5972,65 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolutionun İcracı Mündəricat parçasını başlada bilmədim ."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Html Faylını aça bilmədim:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-" Data oxunarkən xəta oldu:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "Faylının xidmətlər üçün ayrılmış sahəsi yoxdur.\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Xidmæt seç"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"İcracı Mündəricatının arxaplanı üçün başqa HTML səhifəsi seçə "
-"bilərsiniz\n"
-"\n"
-"Ana seçənək üçün boş buraxın"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "%s i əsas GNOME proqramı ilə aç"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "%s i əsas GNOME səyyahı ilə aç"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s a(ə) məktub göndər"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Görünüşü %s a(ə)dəyişdir"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s i(ı) İşə sal"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s i(ı) Qapat"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s i(ı) sola köçür"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s i(ı) sağa köçür"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s i(ı) əvvəlki sətirə köçür"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s i(ı) sonrakı sətirə köçür"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s i(ı) Quraşdır"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "GÖrünüş"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Arxaplan:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"İcracı mündəricatı üzvü Bonoboyu başlada bilmədi.\n"
-"Əgər RootPOA haqqında xəbərdarlıq aldınız isə, deməli Bonoboyu OAG "
-"yerinə\n"
-"GOAD ila dayıqladınız."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "İcracı mündəricat üçün 'Evolution' parçası."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "'Evolution'un icracı mündəricat parçası e'malatxanası."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF mündəricatı e'malatxanası."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Mündəricatı"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Sınaq bonobo parçası e'malatxanası."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Sınaq parçası e'malatxanası."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Bonobo xidməti"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Sınaq xidməti"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Xəta"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Avtomatik güncəllə"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "İndi güncəllə"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Güncəlləməlri hər "
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "dəqiqə"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "il"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "il"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "ay"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "ay"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "həftə"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "həftə"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "gün"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "saat"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "saat"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "dəqiqə"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "saniyə"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "saniyə"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Vaxsey. Tarix atmağı unutmusan."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Vaxsey. Hökmsüz tarixi seçmisən."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5274,7 +6040,7 @@ msgstr ""
 "vfolderin açıq qaldığı müddət ilə müqayisə\n"
 "ediləcəkdir."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5282,7 +6048,7 @@ msgstr ""
 "Bu ismarıc tarixi burada göstərdiyiniz ilə\n"
 "müqayisə ediləcəkdir."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5293,28 +6059,36 @@ msgstr ""
 "\"bir haftə əvval\" məsələn."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "indiki vaxt"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "bildirdiyin vaxt"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "indiki vaxta görə müddət"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Müqayisə et"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "indi"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
 
@@ -5340,8 +6114,8 @@ msgstr ""
 "Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq "
 "seçin."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
@@ -5353,46 +6127,6 @@ msgstr "Qovluq URIsini Bildirin"
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Süzgəcləri Düzəlt"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "VFolderləri Düzəlt"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gələn"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Gedən"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtual Qovluqlar"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "təkcə xüsusi qovluqlar"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vFolder Qaynaqları"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "bütün fəal uzaq qovluqlarla"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "bütün yerli və fəal uzaq qovluqlarla"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "bütün yerli qovluqlarla"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5414,36 +6148,88 @@ msgstr "Qayda adı :"
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Əgər"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Gedişi işə sal"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Kriteriya əlavə et"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "gələn"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "gedən"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Əlavə Et"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Düzəlt"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Süzgəcləri Düzəlt"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VFolderləri Düzəlt"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Gələn"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Gedən"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtual Qovluqlar"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "təkcə xüsusi qovluqlar"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vFolder Qaynaqları"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "bütün fəal uzaq qovluqlarla"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "bütün yerli və fəal uzaq qovluqlarla"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "bütün yerli qovluqlarla"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Rəngi Seç"
 
 #: filter/libfilter-i18n.h:4
@@ -5519,90 +6305,91 @@ msgid "Expression"
 msgstr "İfadə"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "İsmarıcı ünvana irəlilət"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Vacib"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "dir(dır)"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "böyükdür"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "azdır"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "deyil"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "İsmarıc Gövdəsi"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "İsmarıc Başlığı"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "İsmarıc alındı"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "İsmarıc göndərildi"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "da(də) ya da sonra"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "da(də) ya da əvvəl"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1083
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Hal Seç"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Böyüklük"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "oxşayır"
@@ -5623,7 +6410,8 @@ msgstr "başlayır"
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1084
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Mövzu"
 
@@ -5651,188 +6439,275 @@ msgstr "Qaydanı Düzəlt"
 msgid "Score Rules"
 msgstr "Qiymətləndirmə Qaydaları"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Al"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "ePoçt"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Elm məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Elm Poçtu"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Ünvan dəftəri əlavə et"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution Netscape  məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Qurğular..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution Netscape  məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Pine məktub faylları tapdı.\n"
+"Onları proqramımıza idxal edək?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Pine Poçtu"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Məktub taşkilatcısı 'Evolution' parçası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "'Evolution'un ePoçt yazıçısı."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "'Evolution'un icracı mündəricat parçası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "'Evolution'un məktub qovluğu nümayişcisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "'Evolution'un məktub qovluğu nümayişcisi e'malatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "'Evolution'un məktub yazıçısı e'malatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "'Evolution'un məktub parçası e'malatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Məktub Mündəricatı parçası e'malatxanası."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ePoçt Quraşdırılması"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Seçənəklər..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Faylların seçənəklərini təkmilləşdir"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser.c:267
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\"in Seçənəkləri"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Seçənəklər"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Axtarışı vFolder olaraq saxla"
 
-#: mail/folder-browser.c:575 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:578 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:581 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:584 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:608
-msgid "_Open"
-msgstr "_Aç"
-
-#: mail/folder-browser.c:610
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Yenidən Göndər"
 
-#: mail/folder-browser.c:612 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: mail/folder-browser.c:614 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "_Hamısına Cavab Ver"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:625
-msgid "Forward _inline"
-msgstr "_Həmən çatdır"
-
-#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarətlə"
 
-#: mail/folder-browser.c:630 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Vacib"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Ox_unmamış olaraq İşarətlə"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Ünvan dəftəri əlavə et"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:655
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "İsmarıcdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:797
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\"in Seçənəkləri"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Seçənəklər"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Məktub taşkilatcısı 'Evolution' parçası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "'Evolution'un ePoçt yazıçısı."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "'Evolution'un icracı mündəricat parçası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "'Evolution'un məktub qovluğu nümayişcisi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "'Evolution'un məktub qovluğu nümayişcisi e'malatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "'Evolution'un məktub yazıçısı e'malatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "'Evolution'un məktub parçası e'malatxanası."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Məktub Mündəricatı parçası e'malatxanası."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution Elm məktub faylları tapdı.\n"
-"Onları proqramımıza idxal edək?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm Poçtu"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "'Mbox'u 'Evolution' içinə gətirən e'malatxana"
@@ -5851,26 +6726,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "'Outlook Express 4' fayllarını 'Evolution' içinə gətirir."
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution Netscape  məktub faylları tapdı.\n"
-"Onları proqramımıza idxal edək?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution Pine məktub faylları tapdı.\n"
-"Onları proqramımıza idxal edək?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine Poçtu"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Hazırkı Saxlama Şəkli:"
@@ -5905,37 +6760,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "Lazımi bütün mə'lumatlar verilməlidir."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution Hesab Düzəldicisi"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Imza faylı : "
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ismarıc göndərilə bilmədi.\n"
+"\n"
+"Dəyişiklikləri qeyd etmak istəyirsiniz?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (varsayılan) "
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Bağla"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 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:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Geri Qaytar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Bunu əsas hesab olaraq göstər"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution Hesab İdarəcisi"
 
@@ -6003,39 +6890,47 @@ msgstr ""
 "Bu ismarıcın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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:354
+#: mail/mail-callbacks.c:410
 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:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s da(də) %s yazmışdır:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Bu ismarıcı çatdır:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "İsmarıc(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "İsmarıc(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, 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:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6043,7 +6938,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarıcları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6051,31 +6946,24 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarıcları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, 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:1463
 msgid "No Message Selected"
 msgstr "Heç İsmarıc Seçilmədi"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Faylının üsütünə yazım mı?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eyni adlı bir fayl onsuz da vardır.\n"
-"Üstünə yazım mı?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "İsmarıcı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "İsmarıcları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6084,23 +6972,24 @@ msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Süzgəclər ..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "İsmarıcı Çap Et"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, 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?"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Vericiyə bağlantı qurulur..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6145,10 +7034,14 @@ msgstr ""
 "hesab üçün bir ad veriniz. "
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution Hesab Sehirbazı"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Vericiyə bağlantı qurulur..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Dəstəklənən növləri yoxla "
@@ -6158,34 +7051,64 @@ msgid " color"
 msgstr " rəng"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Bu şifrləmə ilə imza dəstəklənmir"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Hesab"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Hesablar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Yapışdırılmış fayl"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Kimlik Yoxlama Növü: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "ePoçtları avtomatik yoxla:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Yaz"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6201,163 +7124,279 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Lahiyələr"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Lahiyələr cərgəsi:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Düzəlt..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Fəallaşdır"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Tam Ad:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Imza faylı : "
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Sitatları Rəngləndir: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_Xətdə"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Məktub Qutusu Şəkli"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Bunu əsas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "İsmarıcları bundan sonra \"Oxundu\" olaraq işarətlə: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Vericisi"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Xəbərlər"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Orqanizasiya"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Rəng al"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, 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:74
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Kotalanmış"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Alma Seçənəkləri"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "İstənən Mə'lumatlar"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Təhlükəsizlik"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Əsas olaraq ePoçtu HTML Şəklində göndər"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Göndərildi"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarıcları"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Göndərilən ismarıclar cərgəsi:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Verici Növü: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Verici tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Qaynaqlar"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Mə'lumat Yoxdur"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Xüsusi Cərgələr"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Növ"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "E'tibarlı bağlantı (SSL) işlət"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "İstifadəçi adı :"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6367,161 +7406,244 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Düzəlt"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "saniyə."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Dialoq qutusunu yarada bilmədim ."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"%s qovluğunu yarada bilmədim:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Dialoq qutusunu yarada bilmədim ."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Dialoq qutusunu yarada bilmədim ."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Diskə Qeyd Et ..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "%s da(də) Aç ..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Xarici Göstərici"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Gizlət"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Xarici Göstərici"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "İsmarıc içindəkilər yüklənir"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Körpünü səyyahda aç"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Ünvanı köçür"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Fərqli qeyd et"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Ünvanı köçür"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Fərqli qeyd et ..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d saniyə"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 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:771
-msgid "Loading message content"
-msgstr "İsmarıc içindəkilər yüklənir"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Tarix"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Göndərən"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Cavab ver"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Gn:"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Heç GPG/PGP proqramı qurulmayıb."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Kodlanmış ismarıc göstərilmədi"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Kodlanmış İsmarıc"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kodu açmaq üçün timsala basın."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 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:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 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:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, 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:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP saytını göstərən ox (%s)"
+
+#: mail/mail-format.c:2102
 #, 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:1856
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' Açılır"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" qovluğunu \"%s\" şəklinə çevir"
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Qovluq yenidən qurulur"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Hazırkı qovluq qapadılır"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Köhnə qovluğun adı dəyişdirilir və açılır"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Yeni bir qovluq yarat"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "İsmarıclar köçürülür"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6530,7 +7652,7 @@ 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:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6538,7 +7660,17 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, 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:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "%s i(ı) Quraşdır"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6547,7 +7679,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6556,101 +7688,105 @@ msgstr ""
 "Əməliyyat aparılırkən xəta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "\"Evolution\"un gedişi"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "İsmarıc göndərilir"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarıc göndərilir"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarıcda xəta"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "İsmarıclar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarıclar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarıclar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Daşınır"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Köçürdülür"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Zibil Qutusu"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "%s qovluğu açılır"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Qovluq yenidən qurulur"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarıcı alınır"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "İsmarıclar alınır"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "%d nin %d ismarıcı alınır (uid \"%s\")"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "İsmarıclar qeyd edilir"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6659,12 +7795,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%d nin %d ismarıcı qeyd edilir (uid \"%s\")"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6673,11 +7804,11 @@ msgstr ""
 "İsmarıcların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6686,233 +7817,196 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "A_xtar"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "( Adsız )"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Çoxlu İsmarıc"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "İsmarıcı Düzəlt"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "İsmarıcı Düzəlt"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Çatdır"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Axtar"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Yol:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Ləğv Edilir ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "ePoçt Göndər və Al"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Alınır"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Güncəllənir ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Gözlənilir ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Göndərilir"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Borulamadan xəsərli bir ismarıc gəldi !"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Poçt Mündəricatı"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Müvəqqəti '%s' mboxu yaradıla bilmir: %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (çatdırilmiş ismarıc)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Dvm: (mövzusuz)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Çatdırılmış ismarıc - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Çatdırılmış ismarıc (mövzusuz)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Çatdırılmış İsmarıc-----<br><b>Göndərən:</b> "
-"%s<br><b>Göndərilən:</b> %s<br><b>Mövzu:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Cavab ver"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "İsmarıcı göndərene cavab ver"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Hamısına cavab ver"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "İsmarıcın bütün alıcılarına cavab ver"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Çatdır"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Bu ismarıcı çatdır"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Seçili ismarıcı çap et"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Bu ismarıcı sil"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Əvvəlki"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Əvvəlki İsmarıc"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "İrəli"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Sonrakı İsmarıc"
-
-#: mail/message-list.c:679
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarıc"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarıc"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:943
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:971
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "İsmarıclar qeyd edilir"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Bayraqlı"
 
-#: mail/message-list.c:1084
-msgid "From"
-msgstr "Göndərən"
-
-#: mail/message-list.c:1084
-msgid "Date"
-msgstr "Tarix"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Alındı"
 
-#: mail/message-list.c:1085
-msgid "To"
-msgstr "Gn:"
-
-#: mail/message-list.c:1085
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Böyüklük"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "İstifadəçi əməliyyatı ləğv etdi."
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Qovluq"
 
@@ -6940,15 +8034,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Üzvlükləri Düzəlt"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "İcracı mündəricat üçün 'Evolution' parçası."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "'Evolution'un icracı mündəricat parçası e'malatxanası."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolutionun İcracı Mündəricat parçasını başlada bilmədim ."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Görüşlər"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Görüşləri göstər"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l %M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Poçt Mündəricatı"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution qurulması"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Təqvim faylı yüklənərkən xəta oldu."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Təqvim yükləmə xətası</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Vəzifələri göstər"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Bölmələr :"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "İsmarıların çap edilməsi bacarılmadı"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobonu başlada bilmədim"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Təmizlə"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Bağla"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Qeyd"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Qeydlər:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Mövcuddur"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Qaynaqlar"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "ay"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Ən Alçaq"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Sınaq"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Ən Alçaq"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Göstər"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "İzah daxil edən"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Yenidən Axtar"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "indi"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "İndi güncəllə"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "İzah daxil edən"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "ePoçt"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Hamısını Göstər"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "İlk ePoçt ünvanı"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "E-poçt Alınır"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Hamısını Göstər"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Hamısını Göstər"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Namə'lum tanıtma vəziyyəti."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Namə'lum xəta"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Görüş Dəvətləri"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Miss"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portret"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Məktublaşma qrupu"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Hamısını Göstər"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Bu pəncərəni qapat"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Xal"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Vəzifələri göstər"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Bu pəncərəni qapat"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Göndər"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Başlıq"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "gün"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Avqust"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Ediləcəklər"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Ediləcəklər"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Cavab cerilmiş"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Qovluqlar"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Bütün Ziyarətçilər"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Bunula başlayan qovluqları göstər:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Göstərmə Seçənəkləri :"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Ekran"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Cümə"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Çərşənbə"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "ay"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "2 həftə"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Vaxt\n"
+"Planlaşdır"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Vəzifələri göstər"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "bütün fəal uzaq qovluqlarla"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Vəzifələri göstər"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Vəzifə"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"   Bölmə:\t"
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Başqa"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Seçkiləri təmizlə"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Aprel"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "'Evolution' qabığı."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Ətraflı"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Görüşü Ləğv Et"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Xüsusi Cərgələr"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution qurulması"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6956,29 +9491,26 @@ msgstr ""
 "Evolutionun bu yeni qurulmasının şəxsi Evolution qovluğuna\n"
 "bə'zi əlavə fayllar köçürməlidir"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 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:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Fayllar düzgün güncəllənə bilmədi"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "\"Evolution\" faylları müvəffəqiyyətlə quruldu."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dəyəsən \"Evolution\"ı ilk dəfə işə salırsan."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "\"Oldu\"'ya tıqlayıb, \"Evolution\" istifadəçi fayllarını buraya qur"
+msgstr ""
+"\"Oldu\"'ya tıqlayıb, \"Evolution\" istifadəçi fayllarını buraya qur"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6989,16 +9521,14 @@ msgstr ""
 "\n"
 "Xəta : %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Faylları `%s''yə\n"
-"köçürdə bilmədim ."
+msgstr "Faylı oxurkən bir xəta oldu ."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7009,7 +9539,16 @@ msgstr ""
 "\"Evolution\" istifadəçi fayllarınin qurulması\n"
 "üçün onu sil."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7020,21 +9559,58 @@ msgstr ""
 "\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
 "istifadəçi fayllarınin qurulması üçün onu sil."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Qovluq alına bilmədi: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Faylları `%s''yə\n"
+"köçürdə bilmədim ."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Qovluğa Köçürt"
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Vaxsey! `%s' nümayişi gözlənilməz şəkildə sonlandı. :-(\n"
-"Bu, %s qisminin çökdüyünə işarət edir."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Qovluğa Köçür"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "%s gün sonra sil"
+
+#: shell/e-shell-folder-commands.c:363
+#, 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:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "%s qovluğu açılır"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7043,15 +9619,15 @@ msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Bildirilən qovluq adı hökmlü deyildir ."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7059,41 +9635,133 @@ msgstr ""
 "Bildirilən gediş üçün bu seçili qovluq növü \n"
 "hökmlü deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "( Adsız )"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "( Heç bir qovluq göstərilmir )"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"\"Evolution\" içinə almaq istədiyiniz faylı seçin. Aşağıdakı "
+"siyahıdan alacağınız faylın növünü də seçin.\n"
+"\n"
+"Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, "
+"\"Evolution\" özü bildiyi kimi edər."
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"%s Alınır\n"
+"Alıcı hazır deyil.\n"
+"Yenidən sınamaq üçün 5 saniyə gözlənir."
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s Alınır\n"
+"%d üzvü alınır."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"İş görəcək alıcı mövcud deyildir\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Alınır"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s Alınır.\n"
+"%s Başladılır"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "%s başladırkən xəta oldu"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "%s yüklənərkən xəta oldu"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s Alınır\n"
+"Alınan üzv 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Avtomatik"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Fayl adı:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Fayl seç"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Fayl növü:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Qovluq Seçin"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7102,31 +9770,88 @@ msgstr ""
 "\"Evolution\" GNOME masa üstü üçün gözəl bir ePoçt, \n"
 "təqvim və əlaqələr idarə proqramıdır."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Yeni bir qısa yol qrupu yarat"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Xətdə İşlə"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Qısa yolları qeyd edərkən xəta oldu."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "( Heç bir qovluq göstərilmir )"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Vaxsey! `%s' nümayişi gözlənilməz şəkildə sonlandı. :-(\n"
+"Bu, %s qisminin çökdüyünə işarət edir."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Qrup adı :"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7135,119 +9860,202 @@ msgstr ""
 "`%s' Qrupunu qısa yol çubuğundan həqiqətən \n"
 "də silmək istəyisiniz?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Silmə"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Kiçik Timsallar"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Böyük Timsallar"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Bu Qrupu _Sil..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Qısa yol Çubuğunu _Gizlət"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Qısa yol Çubuğunu Gizlət"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Fəallaşdır"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Aç"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Yeni Pəncərədə Aç"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Bu qısa yolu fəallaşdırs"
+#: shell/e-shortcuts-view.c:476
+#, 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:479
+#, fuzzy
+msgid "Rename"
+msgstr "Qayda adı :"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Bu qısa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Qısa yolları qeyd edərkən xəta oldu."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Qısa Yol Çubuğu"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Əlaqə"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "( Adsızdır )"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Qadağandır"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 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-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Göstər"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Seçili qovluğu göstər"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% _Qurtardı:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Daxil edən hər hansı üzv"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Ev Sahibi:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7261,107 +10069,6 @@ msgstr "Qovluq növü:"
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri göstərin:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "'Evolution' qabığı."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"\"Evolution\" içinə almaq istədiyiniz faylı seçin. Aşağıdakı "
-"siyahıdan alacağınız faylın növünü də seçin.\n"
-"\n"
-"Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, "
-"\"Evolution\" özü bildiyi kimi edər."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s Alınır\n"
-"Alıcı hazır deyil.\n"
-"Yenidən sınamaq üçün 5 saniyə gözlənir."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s Alınır\n"
-"%d üzvü alınır."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"İş görəcək alıcı mövcud deyildir\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Alınır"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s Alınır.\n"
-"%s Başladılır"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "%s başladırkən xəta oldu"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "%s yüklənərkən xəta oldu"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s Alınır\n"
-"Alınan üzv 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Avtomatik"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Fayl adı:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Fayl seç"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Fayl növü:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Al"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7386,26 +10093,36 @@ msgstr ""
 "Bu vasitə ila xarici faylları \"Evolution\" içinə\n"
 "alacaqsınız."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Al"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Silmə"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Mənə bir də soruşma"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7421,7 +10138,7 @@ msgstr ""
 "fikirlərinizi\n"
 "gözləyirik!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7429,236 +10146,324 @@ msgstr ""
 "Minnətdarıq\n"
 "\"Evolution\" Dəstəsi\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "\"Evolution\" qabığını başlada bilmədim ."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Açılış ekranını gösdərmə"
 
-#: shell/main.c:185
+#: shell/main.c:216
 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:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemini başlada bilmədim."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Köçürt"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Seçiləni köçürt"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Yeni bir hesab yarat"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Əlaqəni sil"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Yeni bir hesab yarat"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Axtar"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Kəs"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Seçiləni kəs"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Bir əlaqəni axtar"
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Əlaqəni sil"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Yeni əlaqə"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Xəbərlər"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Yapışdır"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Ara yaddaşı yapışdır"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Çap ediləcək təqvimi nümayiş etdirər"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Əlaqələri çap et"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Hamısını Seç"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Əlaqəni sil"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Dayan"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Yükləməni Dayandır"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Hamısını Göstər"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Bütün əlaqələri göstər"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Ünvan Dəftəri Qaynağı..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Əlaqə"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Əlaqə"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Çap Et ..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "Əlaqələri a_xtar"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Hamısını Se_ç"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Vasitələr"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 gün"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Seçənəkləri dəyişdir"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Yeni bir bütün gün hadisəsi yarat"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Yeni bir iclas yarat"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Yeni bir təqvim yarat"
+msgid "Create a new appointment"
+msgstr "Yeni bir iclas yarat"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Gün"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Get"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Vaxtda geri get"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Vaxtda irəli get"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "_Tarixə Get"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "_Bugünə Get"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Xüsusi bir tarixə get"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "İndiki vaxta get"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Ay"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Yeni _Hadisə"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Təqvimi Aç"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Geri"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Yeni İclas"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Təqvimi çap et"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Bu Təqvim çap et"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Fərqli Qeyd Et"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "İstənən Mə'lumatlar"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Təqvimi başqa şey olaraq qeyd et"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 günü göstər"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 ayı göstər"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "2 həftəni öster"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "İş həftəsini göstər"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Bugün"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "İ_ş  həftəsi"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Həftə"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "İ_clas"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Məktub Qurğuları..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Gün"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Ay"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Yeni"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Təqvimi aç"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Həftə"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Qapat"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Bu iclası qapat"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Bu iclası sil"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Ana vasitə çubuğu"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Çap Etmə Nüma_yişi"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Çap Qurğuları"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Bu üzvü çap et"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Çap Et ..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Qeyd Et və Qapat"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "İclası qeyd et və dialoqu qapat"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Görünüşü %s a(ə)dəyişdir"
+
+#: ui/evolution-comp-editor.xml.h:18
+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-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Gedişlər"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fayl"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Bu üzvü sil"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Sil..."
 
@@ -7670,27 +10475,12 @@ msgstr "Kömək"
 msgid "Print En_velope..."
 msgstr "_Zərfi Çap Et..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Bu üzvü çap et"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Çap Et ..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Fərqli Qeyd Et ..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Qeyd Et və Qapat"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Əlaqəni qeyd et və dialoqu qapat"
@@ -7707,883 +10497,1004 @@ msgstr "Xətdəki Köməyə bax"
 msgid "Send _message to contact..."
 msgstr "Əlaqəyə yeni bir _ismarıc göndər..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Fayl"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Qeyd Et ..."
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Bu proqram tə'minatı haqqında"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Haqqında..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Gediş_lər"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Bu üzvü sil"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Ünvan _Dəftəri ... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Vəzifəni qeyd et və dialoqu qapat"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Tə_mizlə"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Əlaqəni fərqli yerə gö_ndər..."
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Kə_s"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Əlaqəyə yeni bir _ismarıc göndər..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Adları Y_oxla (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Görüşü Ləğv Et"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Təmizlə"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Seçkiləri təmizlə"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "v_Calendar Şəklində Çatdır (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Bu iclası qapat"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Bu ismarıcı çatdır"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Qovluğa Kö_çür... (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Köçürt"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Görüş\n"
+"İstə"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Seçiləni köçürt"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Görüşləri Planlaşdır"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Kəs"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Görüş Cədvəli"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Seçiləni kəs"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Gedişlər"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Bu iclası sil"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML yekunu"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Ləğv Edildi"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "UI Xml yekununu çıxart"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Hazırkı faylı qeyd et"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Qovluqdakı _İlk Üzv (FIXME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Yaz"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Çat_dır (FIXME)"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Yeni bir ePoçt ismarıcı yaz"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "v_Calendar Şəklində Çatdır (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "İrəlidəki Üzvə Get"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Əvvəlki Üzvə Get"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Nata_mam Vəzifə (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Zibil qutusunu _boşalt"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Faylların seçənəklərini təkmilləşdir"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "_Parolları Unut"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Sonrakı"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Yapışdır"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Al_t Qeydləri İdarə Et..."
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Ara yaddaşı yapışdır"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Geri"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Seçili ismarıcları başqa bir cərgəyə daşı"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Çap Etmə Nüma_yişi"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Al / Göndər"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Çap _Qurğuları..."
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Çap Qurğuları"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Qeyd Et"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "İclası qeyd et və dialoqu qapat"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "Virtual Qovluq _Düzəldicisi..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Hazırkı faylı qeyd et"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Süzgəclər ..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Görüşləri Planlaşdır"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Məktub İsmarıcı"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Bəzi növ görüşləri planlaşdır"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_Məktub Qurğuları..."
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Hamısını Seç"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Nümayiş"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Hər şeyi seçin"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Göndər / Al"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-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-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Vəzifə So_rğusu (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Seçili ismarıcları sil"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Haqqında..."
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Seçili ismarıcları sil"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Qapat"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "S_eçili İsmarıcları Gizlət"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Əlaqələr"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "_Silinmiş İsmarıcları Gizlət"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Köçürt"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "_Oxunmuş İsmarıcları Gizlət"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Ayıqla"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Kömək"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Hamısını O_xunmış olaraq İşarətlə"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Üzv (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "İşarətlə"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Jurnal Girişi (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Ara yaddaşı yapışdır"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Qovluqdakı _Axırıncı Üzv (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Seçili ismarıcları başqa bir cərgəyə daşı"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "e_Poçt İsmarıcı (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "_Hamısını Seç"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Qovluğa _Daşı ... (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "İl_gəyi Seç"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Qeyd (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Yapışdır"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Seçənəklər..."
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Seçili ismarıcları sil"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Hamısını Se_ç"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "_Hamısını Göstər"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Vəzifə"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Oxunmamuş Üzv (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "İşarətlə"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Xidmət Əlavə Et"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Seçili ismarıcları sil"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "İcracı Mündəricata yeni xidmət əlavə et"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "İlgək_lənmiş İsmarıclar Siyahısı"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Yeni bir məktub yarat"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Təmizlə"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "İcracı Mündəricat Qurğuları..."
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Qovluq"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Yeni Məktub"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Seçkiyi _Tərs Çevir"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Əlavə Et hədəfin"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Seçənəklər..."
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "İlgək_lənmiş İsmarıclar Siyahısı"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Yaz"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Seçili ismarıcları sil"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Yeni bir ePoçt ismarıcı yaz"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "İsmarıcın bütün alıcılarına cavab ver"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Cərgə Qur..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "İsmarıcları yeni bir qovluğa daşı"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "İsmarıcı göndərene cavab ver"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Seçili ismarıcları başqa cərgəyə köçür"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "İsmarıcdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Seçili ismarıcları sil"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Bütün ismarıc başlıqlarını göstər"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "İsmarıcı Düzəlt"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Güncəl ismarıcı düzəlt"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Zibil qutusunu _boşalt"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "İsmarıcdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Sil"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "İsmarıcdan _Virtual Qovluq Yarat"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "İsmarıcdan _Virtual Qovluq Yarat"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "İsmarıcdan _Virtual Qovluq Yarat"
+
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "İsmarıcı göndərene cavab ver"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Sonrakı ismarıca get"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Seçili ismarıcları sil"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Əvvəlki ismarıca get"
+
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Əvvəlki ismarıca get"
+
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Əvvəlki ismarıca get"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Məktublaşma Q_rupundakı Süzgəc"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Gö_ndərənə görə Süz"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Alı_cıya görə Süz"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Möv_zuya  görə Süz"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Axırda silmək üçün işarətli bütün məktubları sil"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "_Parolları Unut"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Çatdır"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Fərqli Çatdır"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Həmən çatdır"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Seçili ePoçtu birinə çatdır"
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Bu ismarıcı düzəltdikdün sonra çatdır"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Tam Başlıqlar"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Sonrakı ismarıca get"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Əvvəlki ismarıca get"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "Fərqli Çatdır"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Silinən İsmarıcları Gizlət"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "_Həmən çatdır"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "S_eçili İsmarıcları Gizlət"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "_Həmən çatdır"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "_Silinmiş İsmarıcları Gizlət"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "_Oxunmuş İsmarıcları Gizlət"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Seçimi Tərsinə Çevir"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Al_t Qeydləri İdarə Et..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Seçili ePoçtu birinə çatdır"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Hamısını O_xunmış olaraq İşarətlə"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Çatdırılmış ismarıc"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Oxunmuş Olaraq İşarətlə"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Vacib"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
-msgstr "Oxun_mamış Olaraq İşarətlə"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "İşarətlə"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "İşarətlə"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "İsmarıcı əvvəl oxunmamış olaraq İşarətlə"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "İsmarıcı əvvəl oxunmamış olaraq İşarətlə"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "İşarətlə"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Daşı"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "İsmarıcı yeni bir qovluğa daşı"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Seçili ismarıcları başqa bir cərgəyə daşı"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Yeni Pəncərədə Aç"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "İrəli"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Sonrakı İsmarıc"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Sonrakı İsmarıc"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "İl_gəyi Seç"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Sonrakı İsmarıc"
+
+#: ui/evolution-mail-message.xml.h:56
+#, 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.xml.h:58
-msgid "Print Preview of message..."
-msgstr "İsmarıcın çap etmə Nümayişi..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "İşarətlə"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "İsmarıcı çap et"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Çap ediləcək ismarıcı nümayiş etdirər"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "İsmarıcı çap et ..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Əvvəlki"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "İstiqamətləndir (FIXME: məni qəbul et)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Əvvəlki İsmarıc"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Hamısına cavab ver"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Əvvəlki İsmarıc"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Göndərənə cavab ver"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Əvvəlki İsmarıc"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "İsmarıcı A_xtar"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "İsmarıcı çap et ..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "Qa_ynaq"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Çap Etmə nümayişi"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "İsmarıcı yeni bir fayla qeyd et"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "İsmarıcı Çap Et"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "_Hamısını Seç"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Cavab ver"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "İl_gəyi Seç"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Hamısına cavab ver"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "Al / Göndər"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "İsmarıcı A_xtar"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Bu ismarıcı sizə göndərən nəfərə bir cavab yazın"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "İsmarıcı yeni bir fayla qeyd et"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Bütün seçili məktublara tək məktub yolla"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"Növbədəki ismarıcları göndər\n"
-"    və yeni ismarıcları al"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "_Tam Başlıqlar"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "_Hamısını Göstər"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Gün %s şəklində girilməlidir."
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "İlgək_lənmiş İsmarıclar Siyahısı"
+#: ui/evolution-mail-message.xml.h:77
+#, 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
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "İsmarıca bir fayl əlavə et"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Seçili ismarıcı silmə"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Geri Qaytar"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "Çiy İsmarıc Qaynağını Göstər"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "Gön_dərəndəki vFolder"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr "Virtual Qovluq _Düzəldicisi..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "_Alıcıdakı vFolder"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "_Mövzudakı vFolder"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Süzgəcləri Ə_lavə Et"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Yapışdırılmış Fayl"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Qovluğa Köçürt"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "İsmarıcdan Qayda _Yarat"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "_Təmizlə"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "_Süzgəclər ..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Qovluq"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Çatdırılmış ismarıc"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "_Xətdə"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "İsmarıclar"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Seçkiyi _Tərs Çevir"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Qovluğa Köçür"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "_Məktub İsmarıcı"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Ekran"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "_Məktub Qurğuları..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "İ_smarıcları Yenidən Göndər"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "Seçili Üzvləri _Aç"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "İ_smarıcları Yenidən Göndər"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "_Kotalanmış"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Bu pəncərəni qapat"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Cavabla"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Vasitələr Çubuğunu _Xüsusiləşdir..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "İ_smarıcları Yenidən Göndər"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "_Xüsusiləşdir"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "İsmarıcları _Fərqli Qeyd Et ..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Vasitələr çubuğunu xüsusiləşdir"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "_Göndər / Al"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Qapat"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_İlgəklənmiş"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Göstər"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Yapışdır"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Hazırkı faylı qapat"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Bütün Hadisələri sil"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "İsmarıcı PGP ilə kodla"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "Şəki_l"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "_Mətn faylını daxil et ... "
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Bir faylı mətn olaraq ismarıca əlavə et"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "_Mətn faylını daxil et ... "
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Fayl aç"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP kodla"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP İmzası"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "_Lahiyəni Qeyd Et"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP kodla"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "_Qovluqda Qeyd Et ... (ABY)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Qeyd Et"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Fərqli Qeyd Et"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "_Lahiyəni Qeyd Et"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "_Qovluqda qeyd et ..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Hazırkı faylı qeyd et"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Hazırkı faylı fərqli bir ad altında qeyd et"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "İsmarıcı bildirilən qovluqda qeyd et"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Göndər"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "_Sonra Göndər"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "_Sonra göndər"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "ePoçtu HTML Şəklində göndər"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "İsmarıcı sonra göndər"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "İsmarıcı indi göndər"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Bu ismarıcı indi göndər"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Yapşdırılmış faylları göstər/gizlət"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "_Yapışdırılmış Faylları göstər"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Yapışdırılmış faylları göstər"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "İsmarıcı fərqli bir ad altında qeyd et"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "İsmarıcı fərqli bir ad altında qeyd et"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "GÖNDƏRƏN girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "GÖNDƏRİLƏCƏK girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Yapışdırılmış Fayl"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Bcc Girişi"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Cc Girişi"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Ayıqla"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Sil"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Göndərən Girişi"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Daxil Et"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Mətn faylını daxil et ... ( ABY )"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Aç ..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verləcək Girişi"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Təhlükəsizlik"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Kömək"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısına al"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Qovluq"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Siyahını Yenilə"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Qovluqlar Siyahısını Yenilə"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısından çıxart"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Qeydiyyatdan Keç"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Qeydiyyatdan Çıx"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Ayrıl_mış Vəzifə (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Yenidən Axtar"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Görü İs_təyi (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Yenidən Et"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Geriyə alına gedişi yenidən et"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Dəyişdir"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Kəliməni dəyişdir"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "_Hamısına Cavab Ver (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Vəziyyət Raportunu _GÖndər (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Təkrarlamanı _Keç (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Vəzifəni qeyd et və dialoqu qapat"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Eyni kəliməni yenə axtar"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Kəliməni axtar"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Geriyə Al"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Yeni Vəzifə"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Axırıncı gedişi geriyə al"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Bu vəzifəni sil"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Görüş (ABY)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Siyahını Yenilə"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_İşarətləmə Qurtardı (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Cavab Ver (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Seçili Üzvləri _Aç"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Yeni bir vəzifə yarat"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Bu vəzifəni sil"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Bu vəzifəni sil"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Ara yaddaşı yapışdır"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Vəzifəni və başqa şeyləri də qeyd et"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Vəzifə Seçənəkləri..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Məktub Qurğuları..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Vəzifə"
 
@@ -8591,132 +11502,220 @@ msgstr "_Vəzifə"
 msgid "About Evolution..."
 msgstr "\"Evolution\" Haqqında..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Bu pəncərəni qapat"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Vasitələr Çubuğunu _Xüsusiləşdir..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Qısa Yol Çubuğu"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "_Xüsusiləşdir"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Bu cərgənin xüsusiyyətlərini dəyişdir"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Vasitələr çubuğunu xüsusiləşdir"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Qovluğa Köçürt"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Yeni bir qovluq yarat"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Bu qısa yolu qısa yol çubuğundan sil"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Yeni bir qovluq yarat"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Bu üzvü sil"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Başqa bir qovluğu göstər"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Çı_x"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _Pəncərəsi"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "\"Evolution\" çubuğu _qısa yolu"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Proqramdan çıx"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Ne_cə Başlayaram"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Xarici fayl şəklini idxal et"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Ana vasitə çubuğu"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Seçili ismarıcları başqa bir cərgəyə daşı"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Yeni Pəncərədə Aç"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Güncəl ismarıcları yeni pəncərədə aç"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "\"Evolution\" haqqında mə'lumat göstər"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "\"Bug-buddy\" dəstəyi ilə bir xəta raportunu göndər"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Rolu"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "GÖNDƏRƏN girişinin harda olacağını bildirər"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Ə_laqələr İdarəcisini Necə işlədim"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Təqvimi Necə İşlədim"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "_ePoçt bölməsini necə İşlədim"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Xətdən Qopuq İşlə"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Seçili qovluğu göstər"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Evolution Haqqında..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Gedişlər"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Görüş (ABY)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Əlaqələr"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Köçürt"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Qovluq Çubuğu"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Faylı _İdaxl Et ... "
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_İndeks"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Məktub İsmarıcı"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Daşı"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Yeni"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Aç ..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Qısa Yol Çubuğu"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Vəzifə"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Xətdən Qopuq İşlə"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Məktub Qurğuları..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Ünvan Kartları"
 
 #: views/addressbook/galview.xml.h:2
@@ -8747,9 +11746,12 @@ msgstr "İsmarıclar"
 msgid "With Category"
 msgstr "Kateqoriya ilə"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Girişimli"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%a %B %d %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8823,68 +11825,139 @@ msgstr "İclas sonlanma saatı :"
 msgid "All Attendees"
 msgstr "Bütün Ziyarətçilər"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%a %B %d %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Hazırkı Görünüş"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Bugün"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Oldu"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, 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
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "həftə"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Zibil Qutusu"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Nəqliyyat bacarılmadı"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Xəbərlər"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Namə'lum xəta: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Başqa"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Əlaqə düzəldicisi"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "Ətraflı ..."
-
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Fərqli Qeyd Et ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Hamısını Göstər"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Düzəlt..."
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Ətraflı..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8894,6 +11967,10 @@ msgstr "Mə'lumat"
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Xəta"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Sual"
@@ -8907,7 +11984,7 @@ msgstr "İsmarıc"
 msgid "Don't show this message again."
 msgstr "Bu ismarıcı bir də göstərmə."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Ax_tar"
 
@@ -8931,3 +12008,659 @@ msgstr "init_corba(): GNOME başladıla bilmədi"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Seçənəkləri dəyişdir"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Vəzifə Seçənəkləri..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Əlaqələr ..."
+
+#~ msgid "_Company:"
+#~ msgstr "Ş_irkət :"
+
+#~ msgid "As _Minicards"
+#~ msgstr "_Balaca kartlar olaraq"
+
+#~ msgid "As _Table"
+#~ msgstr "_Cədvəl olaraq"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Bu ünvan dəftərini aça bilmədik. Bu ya səhv bir\n"
+#~ "URI'nin bildirilməsindən ötrü ya da LDAP dəstəyi \n"
+#~ "olmayan bir vericiyə çatmaq istəməsindən ötrüdür.\n"
+#~ "Bir URI bildirdin isə, URI'nin düz olduğunu yoxla və\n"
+#~ "yenə sına. Bir URI bildirimədin isə, bir LDAP vericisinə\n"
+#~ "çatmaq istədin. LDAp'ı istifadə etmək istəyirsənsə , OpenLDAPi(ı)\n"
+#~ "qurub, Evolution'u yenidən yoxlayıb yenidən qurmaq "
+#~ "məcburiyyətindəsən.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Tap..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Təqvimi aç"
+
+#~ msgid "Save calendar"
+#~ msgstr "Təqvimi qeyd et"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Təqvim yükləmə xətası:<br>Bu yol dəstəklanmir"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Zınqırovun səs kəsilməsi müddəti"
+
+#~ msgid "Colors"
+#~ msgstr "Rənglər"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Xəbardarlığı Fəallaşdır"
+
+#~ msgid "Highlight"
+#~ msgstr "İşarətlə"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Bügunkü İşlər:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Hələ Bitirilməmiş İşlər"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Hələ Bitirilməmiş İşlər:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Vaxtı Keçmiş İşlər:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Vəzifə Taxtası"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Keçməsinə qədər qalan vaxt"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Göstərişli Xəbərdarlıqlar"
+
+#~ msgid "Work week"
+#~ msgstr "İş Həftəsi"
+
+#~ 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ə"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Bu vəzifəni düzəlt ..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Vəzifəni Düzəlt"
+
+#~ msgid "Go to Today"
+#~ msgstr "Günə Get"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Komponenet müvəffəqiyyətlə güncəlləndi."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Təqvim faylını yükləyə bilmirəm!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Təqvim faylını oxuya bilmirəm!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Bu, dəvət edilməmiş biri tərəfindən verilən cavabdır!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Təqvim mə'lumatlarını güncəlləyə bilmirəm."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Təqvim komponenetini silə bilmirəm!\n"
+
+#~ 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ə"
+
+#~ msgid "Attendee address"
+#~ msgstr "Ziyarətçilərin ünvanları"
+
+#~ msgid "Attendees: "
+#~ msgstr "Ziyarətçilər:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Görüşü\n"
+#~ "Ləğv Et"
+
+#~ msgid "Organizer: "
+#~ msgstr "Təşkilatçı:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Hadisəni\n"
+#~ "Dərc Et"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Dialoqu göstər"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Görüş Əsasları"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Başlama Tarixi"
+
+#~ msgid "Summary contains"
+#~ msgstr "Xülasə daxil edən"
+
+#~ msgid "Comment contains"
+#~ msgstr "Şərh daxil edən"
+
+#~ msgid "Has category"
+#~ msgstr "Kateqoriyaya sahib olan"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "%s üçün qıfıl faylı sınana bilmədi: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP qovluğu daranır"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Daxili yapışdırma"
+
+#~ msgid "Send as:"
+#~ msgstr "Fərqli göndər:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s imza faylı açıla bilmədi:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Bu normal bir fayl deyildir ."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Bu fayl vardır amma oxuna bilən deyildir ."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr ""
+#~ "Bu fayl əl çatıla biləndi dəyəsən amma open(2)-çağırışı iflas "
+#~ "etdi ."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Bu fayl çox böyükdür ( 100 KB'dən böyük ! ) .\n"
+#~ "Bu faylı daxil etmək istəyirsanmi?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Html Faylını aça bilmədim:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Faylının xidmətlər üçün ayrılmış sahəsi yoxdur.\n"
+
+#~ msgid "Select a service"
+#~ msgstr "Xidmæt seç"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "İcracı Mündəricatının arxaplanı üçün başqa HTML səhifəsi seçə "
+#~ "bilərsiniz\n"
+#~ "\n"
+#~ "Ana seçənək üçün boş buraxın"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "%s i əsas GNOME proqramı ilə aç"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "%s i əsas GNOME səyyahı ilə aç"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s a(ə) məktub göndər"
+
+#~ msgid "Run %s"
+#~ msgstr "%s i(ı) İşə sal"
+
+#~ msgid "Close %s"
+#~ msgstr "%s i(ı) Qapat"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "%s i(ı) sola köçür"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "%s i(ı) sağa köçür"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "%s i(ı) əvvəlki sətirə köçür"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "%s i(ı) sonrakı sətirə köçür"
+
+#~ msgid "Appearance"
+#~ msgstr "GÖrünüş"
+
+#~ msgid "Background:"
+#~ msgstr "Arxaplan:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "İcracı mündəricatı üzvü Bonoboyu başlada bilmədi.\n"
+#~ "Əgər RootPOA haqqında xəbərdarlıq aldınız isə, deməli Bonoboyu OAG "
+#~ "yerinə\n"
+#~ "GOAD ila dayıqladınız."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF mündəricatı e'malatxanası."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF Mündəricatı"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Sınaq bonobo parçası e'malatxanası."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Sınaq parçası e'malatxanası."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Bonobo xidməti"
+
+#~ msgid "Test service"
+#~ msgstr "Sınaq xidməti"
+
+#~ msgid "Update automatically"
+#~ msgstr "Avtomatik güncəllə"
+
+#~ msgid "Forward to Address"
+#~ msgstr "İsmarıcı ünvana irəlilət"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" qovluğunu \"%s\" şəklinə çevir"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Hazırkı qovluq qapadılır"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Köhnə qovluğun adı dəyişdirilir və açılır"
+
+#~ msgid "Copying messages"
+#~ msgstr "İsmarıclar köçürülür"
+
+#~ msgid "Evolution progress"
+#~ msgstr "\"Evolution\"un gedişi"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "%d nin %d ismarıcı alınır (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "%d nin %d ismarıcı qeyd edilir (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Borulamadan xəsərli bir ismarıc gəldi !"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (çatdırilmiş ismarıc)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Dvm: (mövzusuz)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Çatdırılmış ismarıc (mövzusuz)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Çatdırılmış İsmarıc-----<br><b>Göndərən:</b> "
+#~ "%s<br><b>Göndərilən:</b> %s<br><b>Mövzu:</b> %s<br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Seçili ismarıcı çap et"
+
+#~ msgid "Delete this message"
+#~ msgstr "Bu ismarıcı sil"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "\"Evolution\" faylları müvəffəqiyyətlə quruldu."
+
+#~ msgid "Activate"
+#~ msgstr "Fəallaşdır"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Bu qısa yolu fəallaşdırs"
+
+#~ msgid "Find a contact"
+#~ msgstr "Bir əlaqəni axtar"
+
+#~ msgid "View All"
+#~ msgstr "Hamısını Göstər"
+
+#~ msgid "View all contacts"
+#~ msgstr "Bütün əlaqələri göstər"
+
+#~ msgid "5 Days"
+#~ msgstr "5 gün"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Yeni bir təqvim yarat"
+
+#~ msgid "Day"
+#~ msgstr "Gün"
+
+#~ msgid "New _Event"
+#~ msgstr "Yeni _Hadisə"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Təqvimi Aç"
+
+#~ msgid "Prev"
+#~ msgstr "Geri"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Təqvimi başqa şey olaraq qeyd et"
+
+#~ msgid "Week"
+#~ msgstr "Həftə"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Təqvimi aç"
+
+#~ msgid "About this application"
+#~ msgstr "Bu proqram tə'minatı haqqında"
+
+#~ msgid "About..."
+#~ msgstr "Haqqında..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Gediş_lər"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Ünvan _Dəftəri ... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "Tə_mizlə"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Adları Y_oxla (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Qovluğa Kö_çür... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "XML yekunu"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "UI Xml yekununu çıxart"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Qovluqdakı _İlk Üzv (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Çat_dır (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "İrəlidəki Üzvə Get"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Əvvəlki Üzvə Get"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Nata_mam Vəzifə (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "_Sonrakı"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Geri"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Çap _Qurğuları..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Bəzi növ görüşləri planlaşdır"
+
+#~ msgid "Select everything"
+#~ msgstr "Hər şeyi seçin"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Vəzifə So_rğusu (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Haqqında..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Üzv (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Jurnal Girişi (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Qovluqdakı _Axırıncı Üzv (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "e_Poçt İsmarıcı (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Qovluğa _Daşı ... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Qeyd (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Oxunmamuş Üzv (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Xidmət Əlavə Et"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "İcracı Mündəricata yeni xidmət əlavə et"
+
+#~ msgid "Create a new email"
+#~ msgstr "Yeni bir məktub yarat"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "İcracı Mündəricat Qurğuları..."
+
+#~ msgid "New Mail"
+#~ msgstr "Yeni Məktub"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Əlavə Et hədəfin"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Cərgə Qur..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "İsmarıcları yeni bir qovluğa daşı"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Güncəl ismarıcı düzəlt"
+
+#~ msgid "Expunge"
+#~ msgstr "Sil"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Axırda silmək üçün işarətli bütün məktubları sil"
+
+#~ msgid "Forward inline"
+#~ msgstr "Həmən çatdır"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Bu ismarıcı düzəltdikdün sonra çatdır"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Silinən İsmarıcları Gizlət"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Seçimi Tərsinə Çevir"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Oxunmuş Olaraq İşarətlə"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oxun_mamış Olaraq İşarətlə"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "İsmarıcı yeni bir qovluğa daşı"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "İsmarıcın çap etmə Nümayişi..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "İsmarıcı çap et"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "İstiqamətləndir (FIXME: məni qəbul et)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Hamısına cavab ver"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Göndərənə cavab ver"
+
+#~ msgid "S_ource"
+#~ msgstr "Qa_ynaq"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Bu ismarıcı sizə göndərən nəfərə bir cavab yazın"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Bütün seçili məktublara tək məktub yolla"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Növbədəki ismarıcları göndər\n"
+#~ "    və yeni ismarıcları al"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Çiy İsmarıc Qaynağını Göstər"
+
+#~ msgid "_Reply"
+#~ msgstr "_Cavabla"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "İsmarıcları _Fərqli Qeyd Et ..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_İlgəklənmiş"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "_Qovluqda Qeyd Et ... (ABY)"
+
+#~ msgid "Send the message now"
+#~ msgstr "İsmarıcı indi göndər"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Mətn faylını daxil et ... ( ABY )"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Ayrıl_mış Vəzifə (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Görü İs_təyi (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Yenidən Et"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Geriyə alına gedişi yenidən et"
+
+#~ msgid "Replace"
+#~ msgstr "Dəyişdir"
+
+#~ msgid "Replace a string"
+#~ msgstr "Kəliməni dəyişdir"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "_Hamısına Cavab Ver (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Vəziyyət Raportunu _GÖndər (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Təkrarlamanı _Keç (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Eyni kəliməni yenə axtar"
+
+#~ msgid "Search for a string"
+#~ msgstr "Kəliməni axtar"
+
+#~ msgid "Undo"
+#~ msgstr "Geriyə Al"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Axırıncı gedişi geriyə al"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_İşarətləmə Qurtardı (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Cavab Ver (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "\"Evolution\" çubuğu _qısa yolu"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Ətraflı ..."
diff --git a/po/ca.po b/po/ca.po
index a2426ff409..80203ca752 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-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -15,208 +15,216 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Pa�_s:"
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 #, fuzzy
 msgid ""
 "\n"
@@ -233,36 +241,38 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "P�blic"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Mou el missatge"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
@@ -275,14 +285,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
@@ -291,762 +301,880 @@ msgstr "No s'ha pogut iniciar el wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"Utilitat de configuraci� per al conducte de la llibreta d'adreces de "
+"l'Evolution\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Feu clic aqu� per a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:148
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor LDAP:"
+
+#: addressbook/gui/component/addressbook-config.c:150
+#, fuzzy
+msgid "File"
+msgstr "_Fitxer"
+
+#: addressbook/gui/component/addressbook-config.c:153
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Contrasenya"
+
+#: addressbook/gui/component/addressbook-config.c:168
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Error desconegut"
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "Enganxa"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "Subscriu-me"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Host:"
+msgstr "Hores"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN arrel:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "Prioritat:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Cerca"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autenticaci�:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Cam�:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Aquest fitxer no existeix."
+
+#: addressbook/gui/component/addressbook-config.c:663
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:665
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nom:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descripci�:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Afegeix"
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Afegeix una font"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Suprimeix"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nom"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#, fuzzy
+msgid "URI"
+msgstr "URL:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Afegeix"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Edita"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/addressbook.c:345
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+#, fuzzy
+msgid "Any field contains"
+msgstr "El cos cont�"
+
+#: addressbook/gui/component/addressbook.c:555
+#, fuzzy
+msgid "Name contains"
+msgstr "cont�"
+
+#: addressbook/gui/component/addressbook.c:556
+#, fuzzy
+msgid "Email contains"
+msgstr "cont�"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "cont�"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que mostrar� el navegador de carpetes"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Adre�a electr�nica principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Adre�a electr�nica 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Adre�a electr�nica 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Fitxer de signatura:"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crea un nou contacte"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Adre�a electr�nica:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Categories disponibles:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Elimina"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Elimina"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinataris del missatge"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleccioneu els noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleccioneu un nom de la llista:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "categories"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Cerca"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versari:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "F_eina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactes..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalls"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Arxiva com:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nou tipus de tel�fon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tes:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organitzaci�:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipus de tel�fon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Adre�a electr�nica principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Vol rebre correu _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Adre�a de p�gina web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Afegeix"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adre�a..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Nom de l'assistent:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Data de naixement:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Feina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Empresa:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactes..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Nom _complet..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_C�rrec:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Nom del gestor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_M�bil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Sobrenom:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Professi�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_C�njuge:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "T�lex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Adre�a electr�nica 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Adre�a electr�nica 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'edici�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 #, fuzzy
 msgid "E-mail"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adre�a _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Pa�_s:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finl�ndia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "EUA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adre�a:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Poblaci�:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Comprova el nom complet"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 #, fuzzy
 msgid "I"
 msgstr "Si"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "�s"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Primer:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_�ltim:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Mig:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_T�tol:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Com a _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Com a _taula"
-
-#: addressbook/gui/component/addressbook.c:399
-#, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook.c:432
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Ha estat impossible obrir aquesta llibreta d'adreces.\n"
-"Aix� pot ser perqu�, o b� heu introdu�t un URI incorrecte,\n"
-"o b� heu intentat accedir a un servidor LDAP sense tenir\n"
-"compilat el suport per a LDAP. Si heu introdu�t un URI,\n"
-"comproveu que sigui correcte i torneu-lo a introduir. Altrament,\n"
-"segurament heu intentat accedir a un servidor LDAP. Si\n"
-"voleu poder utilitzar LDAP, necessitareu descarregar i instal�lar\n"
-"l'OpenLDAP i recompilar i instal�lar l'Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-#, fuzzy
-msgid "Show All"
-msgstr "Mostra"
-
-#: addressbook/gui/component/addressbook.c:557
-#, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
-
-#: addressbook/gui/component/addressbook.c:587
-#, fuzzy
-msgid "Any field contains"
-msgstr "El cos cont�"
-
-#: addressbook/gui/component/addressbook.c:588
-#, fuzzy
-msgid "Name contains"
-msgstr "cont�"
-
-#: addressbook/gui/component/addressbook.c:589
-#, fuzzy
-msgid "Email contains"
-msgstr "cont�"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que mostrar� el navegador de carpetes"
-
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Other Contacts"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/component/addressbook-config.c:148
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor LDAP:"
-
-#: addressbook/gui/component/addressbook-config.c:150
-#, fuzzy
-msgid "File"
-msgstr "_Fitxer"
+msgid "List _name:"
+msgstr "Nom d'usuari:"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Contrasenya"
+msgid "Members"
+msgstr "desembre"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Error desconegut"
-
-#: addressbook/gui/component/addressbook-config.c:179
-#, fuzzy
-msgid "Base"
-msgstr "Enganxa"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Subtree"
-msgstr "Subscriu-me"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr ""
+msgid "_Remove"
+msgstr "Elimina"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
-msgid "Host:"
-msgstr "Hores"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
+msgid "contact-list-editor"
+msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/addressbook-config.c:409
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Port:"
-msgstr "Prioritat:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "DN arrel:"
+msgid "Contact List Editor"
+msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Cerca"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autenticaci�:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Cam�:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Aquest fitxer no existeix."
-
-#: addressbook/gui/component/addressbook-config.c:647
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "New Contact:"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "Original Contact:"
+msgstr "Autor original:"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nom:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descripci�:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Afegeix una font"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Edita"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "URI"
-msgstr "URL:"
-
-#: addressbook/gui/component/e-address-widget.c:365
-#, fuzzy
-msgid "Disable Queries"
-msgstr "Categories disponibles:"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-#, fuzzy
-msgid "Add to Contacts"
+msgid "Changed Contact:"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-"Utilitat de configuraci� per al conducte de la llibreta d'adreces de "
-"l'Evolution\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Feu clic aqu� per a la llibreta d'adreces"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Elimina"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-#, fuzzy
-msgid "Remove All"
-msgstr "Elimina"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Cerca..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinataris del missatge"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleccioneu els noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select name from:"
-msgstr "Seleccioneu un nom de la llista:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Cerca"
 
@@ -1158,184 +1286,279 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fonts"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Error desconegut"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "S'est� movent"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Perm�s denegat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "No s'ha trobat el fitxer"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operaci� no suportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancel�lat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Error d'E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, 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:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "M�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Cap"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Imprimeix l'agenda"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1379,7 +1602,8 @@ msgid "Dimensions:"
 msgstr "Dimensions:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Lletra..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1439,7 +1663,6 @@ msgid "Margins"
 msgstr "Marges"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
@@ -1519,142 +1742,330 @@ msgstr "Tipus:"
 msgid "Width:"
 msgstr "Amplada:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Lletra..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 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/calendar-commands.c:266
-msgid "File not found"
-msgstr "No s'ha trobat el fitxer"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Obre l'agenda"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, 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
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Desa l'agenda"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, 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
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, 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:8
+#, 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:9
+#, 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/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Mostra informaci� referent a l'Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+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.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Tanca"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "'Snooze'"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Durada de l'snooze (minuts)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Edita una cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "No hi ha cap resum disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Recordatori de la vostra cita a "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "'Snooze'"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "D'acord"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, 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:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "P�blic"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1665,23 +2076,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1691,149 +2106,302 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambd�s inclosos"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "Ara"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 #, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
+msgid "Day View"
+msgstr "Cotxe"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
 #, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
+msgid "Work Week View"
+msgstr "Setmana de treball"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
 #, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "Error en carregar el fitxer: %s"
+msgid "Week View"
+msgstr "Setmana"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mes"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "La URI que mostrar� l'agenda"
 
-#: calendar/gui/calendar-summary.c:616
+#: calendar/gui/dialogs/alarm-options.c:354
 #, fuzzy
-msgid "Display"
-msgstr "_Visualitzaci�"
+msgid "Audio Alarm Options"
+msgstr "Alarmes ac�stiques"
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/dialogs/alarm-options.c:363
 #, fuzzy
-msgid "Show appointments"
-msgstr "Mostra les hores d'acabament de les cites"
+msgid "Message Alarm Options"
+msgstr "Destinataris del missatge"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/dialogs/alarm-options.c:372
 #, fuzzy
-msgid "Show tasks"
-msgstr "Mostra les _adjuncions"
+msgid "Mail Alarm Options"
+msgstr "Opcions de visualitzaci�"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
 #, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimeix l'agenda"
+msgid "Alarm Repeat"
+msgstr "Propietats de l'alarma"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "La URI que mostrar� l'agenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Recordatori de la vostra cita a "
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Esborra la visualitzaci� del missatge"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "'Snooze'"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Final del dia:"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "D'acord"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "_Executa el programa:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dies"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "_Actualitza lliure/ocupat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "hores"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuts"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "dies"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "Mostra 1 dia"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "setmanes"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "Mostra 1 setmana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "hores"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "minuts"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 minuts"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " segons"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " segons"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "Display a message"
+msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "No s'ha pogut crear el directori temporal: %s"
+msgid "Send an email"
+msgstr "S'est� recollint el correu des de %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#, fuzzy
+msgid "Run a program"
+msgstr "_Executa el programa:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "No hi ha cap resum disponible."
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#: calendar/gui/dialogs/alarm-page.c:374
 #, fuzzy
-msgid "Close"
-msgstr "Tanca"
+msgid "before end of appointment"
+msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Edita una cita"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Durada de l'snooze (minuts)"
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Enganxa"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data d'enviament"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Recordatoris"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resum:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opcions"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "despr�s de"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "abans de"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dia(es)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "Recorda'm totes les cites"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "hores"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuts"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "Edita una cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1864,36 +2432,40 @@ msgid "60 minutes"
 msgstr "60 minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Les alarmes es desactiven despr�s de"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes ac�stiques"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Fes un so quan aparegui una finestra d'alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Prefer�ncies de l'agenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Element per fer que ven� avui:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colors"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Colors per a la visualitzaci�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimeix els caps de setmana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Opcions del navegador de dates"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1901,1110 +2473,1226 @@ msgid "Defaults"
 msgstr "Valors predeterminats"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Opcions de visualitzaci�"
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Display"
+msgstr "_Visualitzaci�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Data de venciment"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Habilita l'snoozing per a"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Final del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "primer dia de la setmana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "dv."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Divendres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Ressalta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Elemts que vencen avui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Elements que vencen avui:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Elements que encara no han ven�ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Elements que encara no han ven�ut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "dl."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Dilluns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Elements ven�uts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Elements que ja han ven�ut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Agafa un color"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioritat"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Elements ven�uts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatoris"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "ds."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Mostra"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
-msgid "Show appointment end times"
+msgid "Show appointment end times in week and month views"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Mostra els n�meros de les setmanes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inici del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "dg."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Tasques"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Elemts que vencen avui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "dj."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Dijous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Temps fins al venciment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Temps"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisions de temps:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr "Divisions de temps:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "dm."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuals"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "dc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Setmana de treball"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuts abans que es produeixin."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "segons."
-
-#: calendar/gui/dialogs/delete-comp.c:70
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:58
 #, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, 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/delete-comp.c:82
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
+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/delete-comp.c:88
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "Classificaci�"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Date & Time"
-msgstr "Data d'enviament"
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data completa:"
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Progress"
-msgstr "En proc�s"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "P�_blic"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Sta_rt Date:"
-msgstr "Data d'ini_ci:"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Resu_m:"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tasca"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 #, fuzzy
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contactes..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Data de venciment:"
+msgid " (Completed "
+msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritat:"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Estat:"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
-msgstr "Edita la tasca"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
-msgstr "Sense resum"
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "Categories"
-msgstr "categories"
-
-#: calendar/gui/e-calendar-table.c:159
-#, fuzzy
-msgid "Completion Date"
-msgstr "Completat"
-
-#: calendar/gui/e-calendar-table.c:160
-#, fuzzy
-msgid "End Date"
-msgstr "Hora de _finalitzaci�:"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sense resum"
 
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Start Date"
-msgstr "Data d'ini_ci:"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Voleu sobreescriure el fitxer?"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
-msgid "Percent complete"
-msgstr "Marca la tasca com a completa"
+msgid "Save As..."
+msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Summary"
-msgstr "R_esum"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-#, fuzzy
-msgid "Transparency"
-msgstr "Transparent"
+#: calendar/gui/dialogs/delete-comp.c:84
+#, 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/e-calendar-table.c:168
+#: calendar/gui/dialogs/delete-comp.c:87
 #, fuzzy
-msgid "URL"
-msgstr "URL:"
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmes"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, 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/e-calendar-table.c:170
+#: calendar/gui/dialogs/delete-comp.c:96
 #, fuzzy
-msgid "Click here to add a task"
-msgstr "Feu clic aqu� per a la llibreta d'adreces"
-
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, 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/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/delete-comp.c:105
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Seccions:"
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "Divisions de temps:"
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
-msgstr ""
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "Cites:"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marca com a completa"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Recordatori"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marca la tasca com a completa"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Recurr�ncia"
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 #, fuzzy
-msgid "Edit this task..."
-msgstr "Edita aquest element..."
+msgid "Meeting"
+msgstr "Cancel�lat"
 
-#: calendar/gui/e-calendar-table.c:558
-#, fuzzy
-msgid "Edit the task"
-msgstr "Edita la tasca"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "Classificaci�"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
-msgid "Delete this task"
-msgstr "Suprimeix la tasca"
+msgid "Date & Time"
+msgstr "Data d'enviament"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Suprimeix la tasca"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
+msgstr "Pri_vat"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions de minut"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
+msgstr "P�_blic"
 
-#. 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
-msgstr "%A, %d de %B"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
+msgstr "Resu_m:"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr "_Confidencial"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "_End time:"
+msgstr "Hora de _finalitzaci�:"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora d'_inici:"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
+msgid "Group"
+msgstr "Grup %i"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "New All Day Event"
-msgstr "Esdeveniment per a _tot el dia"
+msgid "Resource"
+msgstr "Font"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-#, fuzzy
-msgid "Go to Today"
-msgstr "V�s a avui"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
 #, fuzzy
-msgid "Go to Date..."
-msgstr "V�s a una data"
+msgid "Chair"
+msgstr "Cotxe"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
 #, fuzzy
-msgid "Open"
-msgstr "_Obre"
+msgid "Required Participant"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-#, fuzzy
-msgid "Delete this Appointment"
-msgstr "Suprimeix aquesta cita"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "Seleccioneu una carpeta"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Make this Occurrence Movable"
-msgstr "Fes aquesta cita movible"
+msgid "Needs Action"
+msgstr "Elimina una acci�"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, fuzzy
-msgid "Delete this Occurrence"
-msgstr "Suprimeix-ne aquesta aparici�"
+msgid "Accepted"
+msgstr "set"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "Suprimeix-ne totes les aparicions"
+msgid "Declined"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:161
-#, fuzzy
-msgid "I couldn't update your calendar file!\n"
-msgstr "No s'ha pogut crear una agenda a `%s'"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
+msgid "Delegated"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En proc�s"
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
 #, fuzzy
-msgid "I couldn't read your calendar file!\n"
-msgstr "No s'ha pogut crear una agenda a `%s'"
-
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
+msgid "Required Participants"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-itip-control.c:499
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
 #, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "No s'ha pogut crear una agenda a `%s'"
+msgid "Optional Participants"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
-msgid "Component successfully deleted."
-msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
+msgid "Sent By:"
+msgstr "Vist"
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, 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"
+msgid "_Delegate To..."
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
 #, fuzzy
-msgid "Add to Calendar"
-msgstr "Sobre l'agenda"
+msgid "Attendee"
+msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:814
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
 #, fuzzy
-msgid " Accept "
-msgstr "set"
+msgid "Common Name"
+msgstr "Completat"
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 #, fuzzy
-msgid " Decline "
+msgid "Delegated From"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 #, fuzzy
-msgid " Tentative "
-msgstr "Tentatiu"
+msgid "Delegated To"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:860
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
 #, fuzzy
-msgid "Update Calendar"
-msgstr "_Obre una agenda"
+msgid "Language"
+msgstr "Busca"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 #, fuzzy
-msgid "Cancel Meeting"
-msgstr "Cancel�lat"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, fuzzy, no-c-format
-msgid "%P %%"
-msgstr "%A, %d de %B"
+msgid "Member"
+msgstr "desembre"
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 #, fuzzy
-msgid "Calendar Message"
-msgstr "Agenda"
+msgid "Role"
+msgstr "M�bil"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 #, fuzzy
-msgid "Date:"
-msgstr "Data de venciment"
+msgid "Status"
+msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
-msgid "Loading calendar..."
-msgstr "Imprimeix l'agenda"
+msgid "Type"
+msgstr "Tipus:"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
 msgstr "Organitzaci�:"
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Server Message:"
-msgstr "Anomena i desa..."
+msgid "_Change Organizer"
+msgstr "Organitzaci�:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resum:"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Invita a altres..."
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organitzaci�:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-#, fuzzy
-msgid "date-start"
-msgstr "Inici del dia:"
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "el"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Tots els assistents"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dia"
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
-msgid "Attendee address"
-msgstr "Tots els assistents"
+msgid "on the"
+msgstr "mes"
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
-msgid "Attendees: "
-msgstr "Tots els assistents"
+msgid "th"
+msgstr "4"
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr "Cancel�lat"
+msgid "occurrences"
+msgstr "aparicions"
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Cotxe"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Recurr�ncia personalitzada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Excepcions"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sense recurr�ncia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
-msgid "Meeting Invitations"
-msgstr "Hora d'_inici de la reuni�:"
+msgid "Preview"
+msgstr "Previsualitzaci�:"
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regla de recurr�ncia"
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Recurr�ncia simple"
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 #, fuzzy
-msgid "Organizer: "
-msgstr "Organitzaci�:"
+msgid "_Modify"
+msgstr "Modifica"
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "per a"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "per sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mes(os)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "fins a"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "setmana(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "any(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data completa:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 #, fuzzy
-msgid "Required Participant"
-msgstr "Persones _requerides"
+msgid "Delegated From:"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 #, fuzzy
-msgid "Role"
-msgstr "M�bil"
+msgid "Delegated To:"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Cap"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
-msgid "Status"
-msgstr "_Estat:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tasca"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% comp_let:"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/dialogs/task-page.glade.h:14
 #, fuzzy
-msgid "Category:"
-msgstr "categories"
+msgid "Progress"
+msgstr "En proc�s"
 
-#: calendar/gui/e-tasks.c:298
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "No s'ha pogut carregar l'agenda en `%s'"
+#: calendar/gui/dialogs/task-page.glade.h:16
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-tasks.c:310
-#, 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/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Data de venciment:"
 
-#. 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/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioritat:"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-#, fuzzy
-msgid "New Appointment..."
-msgstr "Nova cita..."
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Estat:"
 
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Suprimeix-ne totes les aparicions"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Esdeveniment per a _tot el dia"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-#, fuzzy
-msgid "Appointment"
-msgstr "Cites:"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Temes fonamentals sobre les cites"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Recurr�ncia personalitzada"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excepcions"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifica"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sense recurr�ncia"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-#, fuzzy
-msgid "Preview"
-msgstr "Previsualitzaci�:"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Recurr�ncia"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "_Obre"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regla de recurr�ncia"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatori"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
+msgstr "Copia"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
 #, fuzzy
-msgid "Run a program"
-msgstr "_Executa el programa:"
+msgid "_Paste"
+msgstr "Enganxa"
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Send an email"
-msgstr "S'est� recollint el correu des de %s"
+msgid "_Mark as Complete"
+msgstr "Marca com a completa"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Settings..."
-msgstr "_Par�metres"
+msgid "_Delete this Task"
+msgstr "Suprimeix la tasca"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Show a dialog"
-msgstr "Mostra 1 dia"
+msgid "_Mark Tasks as Complete"
+msgstr "Marca com a completa"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Recurr�ncia simple"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Suprimeix la tasca"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
-msgid "_End time:"
-msgstr "Hora de _finalitzaci�:"
+msgid "Click here to add a task"
+msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora d'_inici:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% comp_let:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data d'_inici:"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmes"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
-msgstr "despr�s de"
+#: calendar/gui/e-calendar-table.etspec.h:4
+#, fuzzy
+msgid "Categories"
+msgstr "categories"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
-msgstr "abans de"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "% comp_let:"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dia(es)"
+#: calendar/gui/e-calendar-table.etspec.h:7
+#, fuzzy
+msgid "Completion Date"
+msgstr "Completat"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Data de venciment"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
-msgid "end of appointment"
-msgstr "Recorda'm totes les cites"
+msgid "End Date"
+msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "per a"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "per sempre"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritat"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
-msgid "hour(s)"
-msgstr "hores"
+msgid "Start Date"
+msgstr "Data d'ini_ci:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
-msgid "minute(s)"
-msgstr "minuts"
+msgid "Summary"
+msgstr "R_esum"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mes(os)"
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tasques"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
-msgid "start of appointment"
-msgstr "Edita una cita"
+msgid "Transparency"
+msgstr "Transparent"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "fins a"
+#: calendar/gui/e-calendar-table.etspec.h:18
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "setmana(es)"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions de minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "any(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:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
+msgstr "%A, %d de %B"
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
-msgstr "Edita una cita"
+#. 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:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
-msgstr "el"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dia"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/event-editor.c:603
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "on the"
-msgstr "mes"
+msgid "New _Appointment"
+msgstr "Nova cita..."
 
-#: calendar/gui/event-editor.c:610
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "th"
-msgstr "4"
+msgid "New All Day _Event"
+msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/event-editor.c:756
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "occurrences"
-msgstr "aparicions"
+msgid "Go to _Today"
+msgstr "V�s a avui"
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "V�s a una data"
 
-#: calendar/gui/event-editor.c:1534
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "dies"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid " 1 day"
-msgstr "Mostra 1 dia"
+msgid "Make this Occurrence _Movable"
+msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/event-editor.c:1539
-#, fuzzy, c-format
-msgid " %d weeks"
-msgstr "setmanes"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid " 1 week"
-msgstr "Mostra 1 setmana"
+msgid "Delete _All Occurrences"
+msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/event-editor.c:1544
-#, fuzzy, c-format
-msgid " %d hours"
-msgstr "hores"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1546
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid " 1 hour"
-msgstr "hora"
+msgid "This is a meeting request."
+msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/event-editor.c:1549
-#, fuzzy, c-format
-msgid " %d minutes"
-msgstr "minuts"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-#, fuzzy
-msgid " 1 minute"
-msgstr "10 minuts"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr " segons"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1556
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid " 1 second"
-msgstr " segons"
+msgid "The message is not understandable."
+msgstr ""
+"Aquest missatge no t� cap assumpte.\n"
+"Voleu que l'envi� igualment?"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
 #, fuzzy
-msgid " before start of appointment"
-msgstr "Crea una nova cita"
+msgid "I couldn't update your calendar file!\n"
+msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/event-editor.c:1605
+#: calendar/gui/e-itip-control.c:1015
 #, fuzzy
-msgid " after start of appointment"
-msgstr "Crea una nova cita"
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A, %d de %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid " before end of appointment"
-msgstr "Recorda'm totes les cites"
+msgid "Calendar Message"
+msgstr "Agenda"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
-msgid " after end of appointment"
-msgstr "Crea una nova cita"
+msgid "Date:"
+msgstr "Data de venciment"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
+#: calendar/gui/e-itip-control.glade.h:7
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid "Evolution calendar executive summary component."
+msgid "Server Message:"
+msgstr "Anomena i desa..."
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 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/e-itip-control.glade.h:13
 #, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
+msgid "date-start"
+msgstr "Inici del dia:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/e-tasks.c:252
 #, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "Category:"
+msgstr "categories"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+#: calendar/gui/e-tasks.c:403
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, 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/e-tasks.c:415
+#, 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/GNOME_Evolution_Calendar.oaf.in.h:8
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+msgid "New _Appointment..."
+msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, 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:711
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
@@ -3036,244 +3724,264 @@ msgstr "V�s a una data"
 
 #: calendar/gui/goto-dialog.glade.h:6
 #, fuzzy
-msgid "Go To Today"
-msgstr "V�s a avui"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
 msgid "January"
 msgstr "gener"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 #, fuzzy
 msgid "July"
 msgstr "juliol"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
 msgid "June"
 msgstr "juny"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "March"
 msgstr "mar�"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "Dilluns"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "November"
 msgstr "novembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "October"
 msgstr "octubre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "V�s a avui"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Ds"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimeix aquest element"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "Configuraci� de la p�gina:"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� l'agenda"
@@ -3311,92 +4019,111 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, 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:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "% comp_let:"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -3432,14 +4159,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, 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
+#, 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
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3456,113 +4202,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, 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:148
+#: camel/camel-movemail.c:122
 #, 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:158
+#: camel/camel-movemail.c:130
 #, 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:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error en llegir el fitxer de correu: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error en escriure el fitxer temporal de correu: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, 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:186
+#: camel/camel-pgp-context.c:193
 #, 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:189
+#: camel/camel-pgp-context.c:196
 #, 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:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "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:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, fuzzy, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3582,39 +4323,39 @@ msgid "Could not load %s: No initialization code in module."
 msgstr ""
 "No s'ha pogut carregar %s: el m�dul no cont� cap codi d'inicialitzaci�."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel�lat"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -3731,72 +4472,81 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "Autenticaci�:"
+
+#: camel/camel-search-private.c:111
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Prove�dor de correu de la carpeta virtual"
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 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:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, 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:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3805,12 +4555,73 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Aquest fitxer no existeix."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Aquest fitxer no existeix."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "Tasca"
+msgid "Failed to decode message."
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Assumpte"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
@@ -3819,69 +4630,96 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"Nom�s podeu editar els missatges que s'hagin desat\n"
+"a la carpeta Esborranys."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Error desconegut"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, 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:211
 #, 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:351
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "S'estan escanejant les carpetes de \"%s\""
+msgid "Scanning for changed messages"
+msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, 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:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "C�pia de missatges"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 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-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, 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-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Comprova si hi ha nou correu"
@@ -3891,7 +4729,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:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -3927,30 +4765,30 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3961,101 +4799,111 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Visualitza la carpeta seleccionada"
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "No s'ha pogut crear el directori %s: %s"
+msgid "No such folder %s"
+msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 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:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 #, fuzzy
 msgid "For storing local mail in standard mbox format"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 #, fuzzy
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Fitxers de correu en format mbox d'UNIX"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, 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:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, 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:283
+#: camel/providers/local/camel-local-store.c:279
 #, 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:293
+#: camel/providers/local/camel-local-store.c:289
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, 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:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4064,19 +4912,20 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4086,14 +4935,14 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4103,29 +4952,44 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, 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:152
+#: camel/providers/local/camel-maildir-store.c:166
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"No s'ha pogut crear la carpeta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "No es pot obrir la b�stia de correu temporal: %s"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
@@ -4135,9 +4999,12 @@ msgstr "No es pot obrir la b�stia de correu temporal: %s"
 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:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4146,11 +5013,13 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4195,86 +5064,103 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: 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-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: 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-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, 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:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 #, 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, 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:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, 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:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, 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:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, 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:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
@@ -4284,39 +5170,99 @@ msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+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:465
+#, 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:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' no �s un fitxer habitual."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "La carpeta `%s' no existeix."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Fitxer de correu local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Les carpetes Mbox no es poden imbricar."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Les carpetes Mbox no es poden imbricar."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, 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:817
+#, 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:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 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:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "No s'ha trobat el missatge %s."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 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:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, 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"
@@ -4329,17 +5275,17 @@ msgstr "Not�cies d'USENET"
 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:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cies d'USENET mitjan�ant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4347,8 +5293,8 @@ msgstr ""
 "Aquesta opci� us autentica al servidor NNTP mitjan�ant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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"
@@ -4358,21 +5304,31 @@ msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, 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:199
 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:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, 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:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, 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:320
 #, 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"
@@ -4392,7 +5348,7 @@ msgstr "No suprimeixis els missatges del servidor"
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4430,22 +5386,27 @@ msgstr ""
 "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, 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:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, 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
 #, 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:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, 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:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4454,12 +5415,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:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4467,7 +5428,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:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4476,13 +5437,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4538,7 +5499,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4549,132 +5510,132 @@ msgstr ""
 "Per al lliurament de correu mitjan�ant la connexi� a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, 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:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4685,203 +5646,207 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, 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:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Envia aquest missatge"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autenticaci�:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, 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:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, 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:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Adjunta un fitxer"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 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:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-#, fuzzy
-msgid "Attachment"
-msgstr "adjunci�"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propietats de l'adjunci�"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nom del fitxer:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "adjunci�"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipus de MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "Envia \"%s\""
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -4889,31 +5854,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 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:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4921,41 +5886,96 @@ msgstr ""
 "introdu�u les adreces que rebran una c�pia del missatge sense apar�ixer a la "
 "llista de destinataris del missatge."
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Adjunta un fitxer"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"No s'ha pogut obrir el fitxer de signatura %s:\n"
+"No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "S'est� movent"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: composer/e-msg-composer.c:1055
+#, 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:883
+#: composer/e-msg-composer.c:1061
+#, 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:1067
+#, 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:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4965,53 +5985,35 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr "Aquest fitxer no existeix."
-
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
-msgstr "Aquest fitxer no �s habitual."
-
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr "Aquest fitxer existeix per� no es pot llegir."
-
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Aquest fitxer sembla accessible per� n'ha fallat l'obertura(2)."
-
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"El fitxer �s molt gran (m�s de 100 kB).\n"
-"Segur que voleu inserir-lo?"
-
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
-msgstr "S'ha produ�t un error en llegir el fitxer."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "FIXME: Insereix el fitxer..."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
@@ -5032,307 +6034,126 @@ msgid "calendar information"
 msgstr "Cap informaci�"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, 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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Evolution component for the executive summary."
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "S'est� recollint el correu des de %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Tanca"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mou a la carpeta"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "V�s a l'element anterior"
-
-#: executive-summary/component/e-summary-url.c:79
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "V�s a l'element seg�ent"
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configura la carpeta"
-
-#: executive-summary/component/e-summary.c:924
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Error en llegir el fitxer de correu: %s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "R_esum"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-#, fuzzy
-msgid "Error"
-msgstr "Cap error"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-#, fuzzy
-msgid "Update every "
-msgstr "_Actualitza lliure/ocupat"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuts"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "any"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anys"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "setmana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dies"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "hores"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segon"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segons"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: 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"
@@ -5342,7 +6163,7 @@ msgstr ""
 "sigui quina sigui, en qu� s'executi el filtre\n"
 "o s'obri la vfolder."
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5350,7 +6171,7 @@ msgstr ""
 "La data del missatge es comparar� amb l'hora\n"
 "que indiqueu aqu�."
 
-#: filter/filter-datespec.c:338
+#: 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"
@@ -5361,28 +6182,37 @@ msgstr ""
 "\"fa una setmana\", per exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "l'hora actual"
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "una hora que indiqueu"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Compara-la amb"
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "ara"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "fa"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "fa"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<feu clic aqu� per seleccionar una data>"
 
@@ -5391,11 +6221,11 @@ msgid "Filter Rules"
 msgstr "Regles del filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Afegeix una acci�"
 
@@ -5405,20 +6235,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Introdu�u l'URI de la carpeta"
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<feu clic aqu� per seleccionar una carpeta>"
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5427,7 +6257,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Comprova"
 
@@ -5439,26 +6269,49 @@ msgstr "Nom de la regla: "
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "incoming"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "outgoing"
+msgstr "Agrupament"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Afegeix"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Edita"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Filtres d'edici�"
@@ -5505,400 +6358,539 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigna una puntuaci�"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Attachments"
 msgstr "adjunci�"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "cont�"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepci�"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "no cont�"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "no comen�a per"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Reenvia-ho a l'adre�a"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "no �s"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "�s"
 
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "Is"
-msgstr "Si"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "�s m�s gran que"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "�s m�s petit que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "no �s"
+
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "S'ha rebut el missatge"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "S'ha enviat el missatge"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "el o despr�s del"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "el o abans del"
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Mida"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "comen�a per"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:38
-msgid "contains"
-msgstr "cont�"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "ha estat despr�s de"
 
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
-msgstr "no cont�"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "ha estat abans de"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
-msgstr "no acaba amb "
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "M�bil"
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
-msgstr "no existeix"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Afegeix una regla"
 
-#: filter/libfilter-i18n.h:42
+#: filter/rule-editor.c:299
 #, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
+msgid "Edit Rule"
+msgstr "Filtres d'edici�"
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
-msgstr "no comen�a per"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "Edita la regla de puntuaci�"
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
-msgstr "acaba amb"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
-msgstr "existeix"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
-msgstr "�s m�s gran que"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "_Correu"
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
-msgstr "�s m�s petit que"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "no �s"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Adre�a electr�nica 2"
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "�s"
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Desa a la llibreta d'adreces"
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
-msgstr "el o despr�s del"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
-msgstr "el o abans del"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_Par�metres"
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
-msgstr "comen�a per"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
-msgstr "ha estat despr�s de"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Adre�a electr�nica principal"
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
-msgstr "ha estat abans de"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
 
-#: filter/score-editor.c:130
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Score Rules"
-msgstr "Edita la regla de puntuaci�"
+msgid "Evolution mail composer."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:329
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configuraci� del correu"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Propietats..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Propietats de la llista de coses per fer"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccioneu una carpeta"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "VFolder sobre el remitent"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "VFolder sobre els destinataris"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:1247
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "segon"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
-msgid "Save As..."
+msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "_Imprimeix"
+
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
-msgstr "Respon a tots"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
-msgstr "Reenvia"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-#, fuzzy
-msgid "Forward inline"
-msgstr "V�s endavant en el temps"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Reenvia"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 #, fuzzy
-msgid "Mark as Read"
+msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:588
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 #, fuzzy
-msgid "Mark as Unread"
+msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1295
 #, fuzzy
-msgid "Move to Folder..."
-msgstr "Mou a la carpeta"
+msgid "Mark as _Important"
+msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:1297
 #, fuzzy
-msgid "Copy to Folder..."
-msgstr "Copia a la carpeta"
+msgid "Mark as Unim_portant"
+msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Undelete"
-msgstr "Suprimeix"
+msgid "_Move to Folder..."
+msgstr "_Mou a la carpeta"
+
+#: mail/folder-browser.c:1304
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copia a la carpeta"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Suprimeix"
+
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Desa a la llibreta d'adreces"
+
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
-msgstr ""
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
+msgstr "Carpetes virtuals"
+
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtre sobre la llista de correu"
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Evolution mail composer."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Factory to import mbox into Evolution"
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
 #: mail/local-config.glade.h:1
 #, fuzzy
@@ -5936,49 +6928,80 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: 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 ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Aquest missatge no s'ha enviat.\n"
+"\n"
+"Voleu desar-ne els canvis?"
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Valors predeterminats"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Suprimeix"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5999,11 +7022,11 @@ msgstr "Correu de %s"
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6015,7 +7038,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6023,7 +7046,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6031,11 +7054,11 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6043,36 +7066,51 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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:351
+#: mail/mail-callbacks.c:410
 #, 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:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, 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:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6080,7 +7118,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -6089,29 +7127,29 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Voleu sobreescriure el fitxer?"
-
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6120,15 +7158,62 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtres de correu ..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
@@ -6145,39 +7230,70 @@ msgstr "Colors"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
 msgid "Account"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "adjunci�"
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redacta"
+
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -6190,391 +7306,551 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Edita..."
+
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Inhabilitat"
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:43
 #, fuzzy
-msgid "Highlight citations with "
+msgid "Highlight citations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Visualitza en l�nia"
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Agafa un color"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "S'est� afegint un missatge sense cap assumpte"
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Cap"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Data de recepci�"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Secure MIME"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Envia els missatges en format HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Font"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Cap informaci�"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Type"
-msgstr "Tipus:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "_Edita"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "newswindow1"
+msgstr "finestra1"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segons."
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Obre a %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualitzador extern"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Obre a %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualitzador extern"
+
+#: mail/mail-display.c:1048
+#, fuzzy
+msgid "Loading message content"
+msgstr "S'estan reenviant els missatges \"%s\""
+
+#: mail/mail-display.c:1404
 #, fuzzy
-msgid "Open link in browser"
+msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Copy Link Location"
+msgstr "_Contacte (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Save Image as..."
+msgstr "Anomena i desa..."
 
-#: mail/mail-format.c:518
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " segons"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 #, 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:742
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "S'estan reenviant els missatges \"%s\""
+msgid "Date"
+msgstr "Data de venciment"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Adre�a electr�nica:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "De:"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Respon"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Per a"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "No hi ha cap programa GPG/PGP disponible."
+
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "La carpeta `%s' no existeix."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Obre a %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Canvia la carpeta \"%s\" al format \"%s\""
-
-#: mail/mail-local.c:815
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Configura la carpeta"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr "S'est� tancant la carpeta actual"
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr "S'est� canviant el nom de la carpeta antiga i obrint-la"
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr "Creaci� d'una nova carpeta"
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr "C�pia de missatges"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6583,7 +7859,7 @@ msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6591,7 +7867,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_Configura la carpeta"
+
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6600,7 +7885,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6609,46 +7894,32 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:589
-#, fuzzy
-msgid "Sending message"
-msgstr "Envia aquest missatge"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'est� marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
@@ -6663,299 +7934,302 @@ msgstr "Mou el(s) missatge(s) cap a"
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "S'est� movent"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "S'est� copiant"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Tasca"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "_Configura la carpeta"
+
+#: mail/mail-ops.c:1604
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1550
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "S'est� recuperant el missatge n�mero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1634
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, 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:1726
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "S'est� recuperant el missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, 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:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "S'est� recollint el correu des de %s"
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
+msgid "(Untitled Message)"
+msgstr "(Sense t�tol)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mou el missatge"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Edita el missatge"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "_Edita el missatge"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Reenvia"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
 msgstr "Cerca"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Cam�:"
+
+#: mail/mail-send-recv.c:141
 #, fuzzy
-msgid "Cancelling ..."
+msgid "Cancelling..."
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 #, fuzzy
 msgid "Receiving"
 msgstr "Data de recepci�"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr ""
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
+msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr ""
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
+msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "S'ha escrit un missatge incomplet al conducte!"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (missatge reenviat)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Re: (sense assumpte)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Missatge reenviat (sense assumpte)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr "Respon"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
-msgstr "Respon al remitent d'aquest missatge"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
-msgstr "Respon a tots els destinataris d'aquest missatge"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
-msgstr "Reenvia aquest missatge"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
-msgstr "Imprimeix el missatge seleccionat"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Suprimeix aquest missatge"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "From"
-msgstr "De:"
+msgid "Updating message list"
+msgstr "C�pia de missatges"
 
-#: mail/message-list.c:1053
-#, fuzzy
-msgid "Date"
-msgstr "Data de venciment"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepci�"
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr "Per a"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Mida"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
@@ -6986,138 +8260,1455 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestiona les subscripcions..."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
-msgid "Folder name:"
-msgstr "Nom del fitxer:"
+msgid "Evolution component for the executive summary."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Folder type:"
-msgstr "Carpetes"
+msgid "Factory for the Evolution executive summary component."
+msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: my-evolution/component-factory.c:140
 #, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "No hi ha espai suficient per crear la carpeta"
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Cites:"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sense resum"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "No hi ha nou correu a %s."
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Afegeix un servidor de not�cies"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
 
-#: shell/importer/importer.c:351
+#: my-evolution/e-summary-preferences.c:1408
 #, fuzzy
-msgid "Importing"
-msgstr "S'est� movent"
+msgid "My Evolution Settings"
+msgstr "Instal�laci� de l'Evolution"
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/importer/importer.c:387
-#, fuzzy, c-format
-msgid "Error loading %s"
-msgstr "Error en carregar el fitxer: %s"
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Mostra les _adjuncions"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:473
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
-msgid "Automatic"
-msgstr "Tria autom�tica"
+msgid "Regions"
+msgstr "Seccions:"
 
-#: shell/importer/importer.c:523
+#: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "Filename:"
-msgstr "Nom del fitxer:"
+msgid "%A, %d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Select a file"
-msgstr "Fitxer de signatura:"
+msgid "Print My Evolution"
+msgstr "Evolution"
 
-#: shell/importer/importer.c:538
+#: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "File type:"
-msgstr "Nom del fitxer:"
+msgid "Printing of My Evolution failed"
+msgstr "Ha fallat la impressi� del missatge"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Agenda"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
 #, fuzzy
-msgid "Evolution Import Utility"
-msgstr "Conducte de les coses per fer de l'Evolution"
+msgid "Variable"
+msgstr "Inhabilitat"
 
-#: shell/importer/import.glade.h:3
+#: my-evolution/metar.c:64
 #, fuzzy
-msgid "Evolution Importer Utility"
-msgstr "Conducte de les coses per fer de l'Evolution"
+msgid "North"
+msgstr "quart"
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_tes:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "�ltim"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fonts"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "quart"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Baixa"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Comprova"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Baixa"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "R�dio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Heavy rain"
+msgstr "Abast de dies"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "ara"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Snow grain showers"
+msgstr "Mostra en aquest ordre"
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "_Correu"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#, fuzzy
+msgid "Light hail"
+msgstr "vuit�"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Mostra 1 dia"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Adre�a electr�nica principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Sendmail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Error desconegut"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Hora d'_inici de la reuni�:"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "�s"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Vertical"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Llista de correu %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Suprimeix aquesta cita"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Puntuaci�"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Suprimeix aquesta cita"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "_Envia"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cap�alera"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Light haze"
+msgstr "vuit�"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dies"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "agost"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Afegeix un servidor de not�cies"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Carpetes"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Tots els assistents"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Visualitza les carpetes que continguin:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Opcions de visualitzaci�"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "_Visualitzaci�"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Divendres"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Servidors de not�cies"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Dimecres"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "Mostra 1 setmana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Seleccioneu una carpeta"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Mostra en aquest ordre"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tasques"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Altres"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Par�metres de prova"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalls"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Cancel�lat"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Carpetes virtuals"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instal�laci� de l'Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7125,32 +9716,28 @@ msgstr ""
 "Aquesta nova versi� de l'Evolution necessita instal�lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 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:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Sembla que aquesta �s la primera vegada que executeu l'Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal�lar els fitxers d'usuari\n"
 "de l''Evolution a"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7161,16 +9748,14 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"No es poden copiar els fitxers a\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "S'ha produ�t un error en llegir el fitxer."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7181,7 +9766,16 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal�laci�\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7192,7 +9786,60 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal�laci� dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "No es pot bifurcar %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"No es poden copiar els fitxers a\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copia a la carpeta"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mou a la carpeta"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Suprimeix la tasca"
+
+#: shell/e-shell-folder-commands.c:363
+#, 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:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7201,15 +9848,15 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "El nom de carpeta indicat no �s v�lid."
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7217,28 +9864,123 @@ 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:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, 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:362
+#, fuzzy
+msgid "Importing"
+msgstr "S'est� movent"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "Tria autom�tica"
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "Nom del fitxer:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Fitxer de signatura:"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "Nom del fitxer:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Seleccioneu una carpeta"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 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:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7248,30 +9990,72 @@ msgstr ""
 "per a correu, agenda i gesti� de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crea un nou grup de dreceres"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "S'est� movent"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "S'est� movent"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7280,15 +10064,15 @@ msgstr ""
 "Ep!  La visualitzaci� de `%s' s'ha mort inesperadament.  :-(\n"
 "Aix� segurament vol dir que el component %s ha petat."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7297,147 +10081,272 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Elimina aquest grup..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activa"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activa aquesta drecera"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Envia aquest missatge"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la regla: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "_Visualitza"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Visualitza la carpeta seleccionada"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contactes..."
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Error gen�ric"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Perm�s denegat"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
+msgid "%s (%d%% complete)"
+msgstr "% comp_let:"
 
-#: shell/main.c:83
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "El cos cont�"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Hores"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom del fitxer:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Carpetes"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "No hi ha espai suficient per crear la carpeta"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "S'est� movent"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "No l'eliminis"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Envia aquest missatge"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7464,7 +10373,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7472,268 +10381,348 @@ msgstr ""
 "Gr�cies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copia"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#, fuzzy
+msgid "Copy the selection"
+msgstr "_Inverteix la selecci�"
+
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
 msgid "Create new contact"
 msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Suprimeix un contacte"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Cerca"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "Cut"
+msgstr "Personalitzat"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Cut the selection"
+msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Cerca un contacte"
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "New contact"
 msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nou"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Enganxa"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "Selecciona'ls _tots"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Suprimeix un contacte"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Atura"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Atura la c�rrega"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Visualitza'ls tots"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Visualitza tots els contactes"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contactes..."
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "Selecciona'ls _tots"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Eines"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dies"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Modifica les prefer�ncies"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Crea una nova agenda"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crea una nova cita"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crea una nova agenda"
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dia"
+#, fuzzy
+msgid "Create an event for the whole day"
+msgstr "Crea una nova cita per a avui"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "V�s a"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "V�s enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "V�s endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "V�s a una data"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "V�s a avui"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "V�s a una data concreta"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "V�s al present"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New _Event"
-msgstr "Nova a_genda"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seg�ent"
-
-#: ui/evolution-calendar.xml.h:20
-#, fuzzy
-msgid "Open Calendar"
-msgstr "_Obre una agenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Anterior"
+msgid "New Appointment"
+msgstr "Nova cita..."
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimeix l'agenda"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "Save As"
-msgstr "_Anomena i desa"
+msgid "Publish Free/Busy Information"
+msgstr "Cap informaci�"
 
-#: ui/evolution-calendar.xml.h:28
-#, fuzzy
-msgid "Save calendar as something else"
-msgstr "Deixa l'agenda com a alguna altra cosa"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
-msgstr "Avui"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "Setmana de treball"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Setmana"
-
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Cites:"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Par�metres"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nou"
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
+msgstr "Setmana"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Obre una agenda"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Tanca"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "_Save As..."
-msgstr "Anomena i desa..."
+msgid "Close this appointment"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "_Week"
-msgstr "Setmana"
+msgid "Preview the printed item"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Previsualitzaci� d'impressi�"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configuraci� de la p�gina:"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimeix aquest element"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimeix..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Desa i tanca"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Desa el contacte i tanca el quadre de di�leg"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Accions"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fitxer"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete..."
 msgstr "Suprimeix"
@@ -7748,28 +10737,13 @@ msgstr "_Ajuda"
 msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprimeix aquest element"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimeix..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Desa i tanca"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de di�leg"
@@ -7787,1049 +10761,1056 @@ msgstr "Consulta l'ajuda en l�nia"
 msgid "Send _message to contact..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "_Fitxer"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Desa"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:2
 #, fuzzy
-msgid "About this application"
-msgstr "Autenticaci�:"
+msgid "Delete this list"
+msgstr "Suprimeix aquest element"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:6
 #, fuzzy
-msgid "About..."
-msgstr "Lletra..."
+msgid "Save the list and close the dialog box"
+msgstr "Desa el contacte i tanca el quadre de di�leg"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
-msgid "Actio_ns"
-msgstr "_Accions"
+msgid "Se_nd list to other..."
+msgstr "_Invita a altres..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "Address _Book... (FIXME)"
-msgstr "FIXME: _Llibreta d'adreces..."
+msgid "Send _message to list..."
+msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#: ui/evolution-event-editor.xml.h:1
 #, fuzzy
-msgid "C_lear"
-msgstr "Agenda"
+msgid "Cancel Mee_ting"
+msgstr "Cancel�lat"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-#, fuzzy
-msgid "C_ut"
-msgstr "Personalitzat"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Forward as i_Calendar"
+msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 #, fuzzy
-msgid "Clear"
-msgstr "Agenda"
+msgid "Forward this item via email"
+msgstr "Reenvia aquest missatge"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
 #, fuzzy
-msgid "Clear the selection"
-msgstr "_Inverteix la selecci�"
+msgid "Re_fresh Meeting"
+msgstr "Refresca la llista"
 
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:7
 #, fuzzy
-msgid "Close this appointment"
-msgstr "Suprimeix aquesta cita"
+msgid "Schedule _Meeting"
+msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 #, fuzzy
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Copia a la carpeta"
+msgid "Schedule a meeting for this item"
+msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copia"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Accions"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "Copy the selection"
-msgstr "_Inverteix la selecci�"
+msgid "Customise My Evolution"
+msgstr "Evolution - %s"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-mail-global.xml.h:1
 #, fuzzy
-msgid "Cut"
-msgstr "Personalitzat"
+msgid "Cancel"
+msgstr "Cancel�lat"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-mail-global.xml.h:2
 #, fuzzy
-msgid "Cut the selection"
-msgstr "_Inverteix la selecci�"
+msgid "Cancel the current mail operation"
+msgstr "l'hora actual"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Suprimeix aquesta cita"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Redacta"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Redacta un nou missatge"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-#, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "FIXME: Pr_imer element de la carpeta"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-#, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "_Tasca (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "FIXME: Reenvia com a v_Calendar"
+msgid "Empty _Trash"
+msgstr "Dies buits:"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "V�s a l'element seg�ent"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Oblida les _contrasenyes"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "V�s a l'element anterior"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Manage _Subscriptions..."
+msgstr "Gestiona les subscripcions..."
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "Propietats de la llista de coses per fer"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
-msgid "N_ext"
-msgstr "Seg�ent"
+msgid "Send / Receive"
+msgstr "Sendmail"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Enganxa"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-#, fuzzy
-msgid "Paste the clipboard"
-msgstr "Enganxa l'element del porta-retalls"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Ant_erior"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "Previous"
-msgstr "Ant_erior"
+msgid "Virtual Folder _Editor..."
+msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Print Pre_view"
-msgstr "Previsualitzaci� d'impressi�"
+msgid "_Filters..."
+msgstr "_Filtres de correu ..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "Imprimeix..."
+msgid "_Mail Message"
+msgstr "FIXME: Missatge de _correu"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
-msgid "Print Setup"
-msgstr "Configuraci� de la p�gina:"
+msgid "_Mail Settings..."
+msgstr "_Par�metres"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Desa"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Previsualitzaci�:"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de di�leg"
+msgid "_Send / Receive"
+msgstr "Sendmail"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "Save the current file"
-msgstr "l'hora actual"
+msgid "Copy selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:46
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "Seleccioneu una carpeta"
+msgid "Cut selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
-msgid "Select All"
-msgstr "Selecciona'ls _tots"
+msgid "Hide _Deleted Messages"
+msgstr "Suprimeix el missatge"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "Seleccioneu una carpeta"
+msgid "Hide _Read Messages"
+msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Mark All as R_ead"
+msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "_About..."
-msgstr "_Quant a l'Evolution..."
+msgid "Mark all visible messages as read"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#: ui/evolution-mail-list.xml.h:13
 #, fuzzy
-msgid "_Close"
-msgstr "Tanca"
+msgid "Paste message in the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "_Contacte (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Mou un missatge a una nova carpeta"
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#: ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "_Copy"
-msgstr "Copia"
+msgid "Select _Thread"
+msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Ajuda"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Select all visible messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Show _All"
+msgstr "Mostra"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-#, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "FIXME: _�ltim element de la carpeta"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "Missatge de _correu (FIXME)"
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mou a la carpeta"
+msgid "Temporarily hide the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-#, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Contacte (FIXME)"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-#, fuzzy
-msgid "_Paste"
-msgstr "Enganxa"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Esborra"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimeix"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Carpeta"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverteix la selecci�"
+
+#: ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propietats..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
-msgid "_Select All"
-msgstr "Selecciona'ls _tots"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "_Threaded Message List"
+msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "Afegeix una font"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "Crea un nou contacte"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-executive-summary.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
-msgid "New Mail"
-msgstr "Recupera el correu"
+msgid "Create _Virtual Folder From Message"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Redacta"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Redacta un nou missatge"
+#: ui/evolution-mail-message.xml.h:11
+#, fuzzy
+msgid "Create a rule to filter messages with this subject"
+msgstr "Envia un missatge sense assumpte"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "Mou a la carpeta"
+msgid "Create a virtual folder for these recipients"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copia el missatge a una nova carpeta"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "Copia el missatge a una nova carpeta"
+msgid "Create a virtual folder for this sender"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this subject"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
-msgid "Delete the selected messages"
+msgid "Display the next important message"
+msgstr "Respon al remitent d'aquest missatge"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "l'hora actual"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
-msgid "Edit Message"
-msgstr "_Edita el missatge"
+msgid "Display the previous important message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Edit the current message"
-msgstr "l'hora actual"
+msgid "Display the previous message"
+msgstr "Voleu descartar aquest missatge?"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
-msgid "Empty _Trash"
-msgstr "Dies buits:"
+msgid "Display the previous unread message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Expunge"
-msgstr "_Esborra"
+msgid "Filter on Mailing _List..."
+msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
-msgstr "Oblida les _contrasenyes"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Forward As"
 msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Reenvia un missatge sense cap assumpte"
+msgid "Forward _Attached"
+msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Full _Headers"
-msgstr "Cerca completa"
+msgid "Forward _Inline"
+msgstr "V�s endavant en el temps"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Suprimeix el missatge"
+msgid "Forward _Quoted"
+msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Hide S_elected Messages"
+msgid "Forward the selected message in the body of a new message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:33
-#, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Suprimeix el missatge"
-
-#: ui/evolution-mail.xml.h:34
-#, fuzzy
-msgid "Hide _Read messages"
-msgstr "Missatge reenviat - %s"
-
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
-msgid "Invert Selection"
-msgstr "_Inverteix la selecci�"
+msgid "Forward the selected message quoted like a reply"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "Gestiona les subscripcions..."
+msgid "Forward the selected message to someone"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
-msgid "Mar_k as Read"
-msgstr "Mar_ca'l com a llegit"
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Mark All as R_ead"
-msgstr "Mar_ca'l com a llegit"
+msgid "Load _Images"
+msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As Read"
-msgstr "Mar_ca'l com a llegit"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mark as U_nread"
+msgid "Mark as Unimp_ortant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
-msgstr "Mou un missatge a una nova carpeta"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
-msgstr "Obre'l en una nova finestra"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Seg�ent"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Message"
+msgstr "_Missatge"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Selecciona'ls _tots"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Mou el missatge"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
-msgstr "Previsualitzaci� d'impressi� del missatge..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
-msgstr "Imprimeix el missatge a la impressora"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
-msgstr "Imprimeix el missatge..."
+#: ui/evolution-mail-message.xml.h:59
+#, fuzzy
+msgid "Previous"
+msgstr "Ant_erior"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
-msgstr "Respon a _tots"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to all"
-msgstr "Respon a tots"
+msgid "Previous Unread Message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Reply to sender"
-msgstr "Respon al remitent"
+msgid "Print Message..."
+msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "S_ource"
-msgstr "Font"
+msgid "Print Preview..."
+msgstr "Previsualitzaci� d'impressi�"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "Desa el missatge a una carpeta determinada"
+msgid "Print this message"
+msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Selecciona'ls _tots"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Respon"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Respon a tots"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Select _Thread"
-msgstr "Selecciona'ls _tots"
+msgid "S_earch Message"
+msgstr "Anomena i desa..."
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
-msgid "Send / Receive"
-msgstr "Sendmail"
+msgid "Save the message as a text file"
+msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Show Email _Source"
+msgstr "Font del correu"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Envia el correu de la cua i recupera'n el nou"
+msgid "Show Full _Headers"
+msgstr "Cerca completa"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envia el correu de la cua i recupera'n el nou"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Show _All"
-msgstr "Mostra"
+msgid "Show message with all email headers"
+msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
-msgstr "Llista de missatges en cadena"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Filtre sobre la llista de correu"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:86
-#, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "Editor de carpetes _virtuals..."
-
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "adjunci�"
-
-#: ui/evolution-mail.xml.h:89
-#, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Copia a la carpeta"
+msgid "_Copy to Folder"
+msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr "_Esborra"
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_Filtres de correu ..."
-
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Carpeta"
+msgid "_Forward Message"
+msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
-msgstr "_Reenvia"
-
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Visualitza en l�nia"
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverteix la selecci�"
+msgid "_Message Display"
+msgstr "Esborra la visualitzaci� del missatge"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Mail Message"
-msgstr "FIXME: Missatge de _correu"
+msgid "_Move to Folder"
+msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
-msgid "_Mail Settings..."
-msgstr "_Par�metres"
+msgid "_Normal Display"
+msgstr "_Visualitzaci�"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Mou a la carpeta"
+msgid "_Open Message"
+msgstr "_Edita el missatge"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "Obre la tasca"
+msgid "_Re-send Message"
+msgstr "_Edita el missatge"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
-msgid "_Quoted"
-msgstr "Cap"
+msgid "Close this window"
+msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-mail.xml.h:104
-#, fuzzy
-msgid "_Reply"
-msgstr "Respon"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 #, fuzzy
-msgid "_Resend Messages"
-msgstr "_Edita el missatge"
+msgid "Customize"
+msgstr "Cerca personalitzada"
 
-#: ui/evolution-mail.xml.h:107
-#, fuzzy
-msgid "_Save Message As..."
-msgstr "_Anomena i desa..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Send / Receive"
-msgstr "Sendmail"
-
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr "_En cadena"
+msgid "_Close"
+msgstr "Tanca"
 
-#: ui/evolution-mail.xml.h:111
-#, fuzzy
-msgid "_Undelete"
-msgstr "_Suprimeix"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Visualitza"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjunta"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
 msgid "Close the current file"
 msgstr "l'hora actual"
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
+msgid "Delete all but signature"
+msgstr "Fitxer de signatura:"
+
+#: ui/evolution-message-composer.xml.h:6
+#, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "Edita el missatge"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Insereix un fitxer com a text dins del missatge"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 #, fuzzy
 msgid "Insert text file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "Obre un fitxer"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-#, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Desa a la _carpeta..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Desa"
+
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "_Anomena i desa"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "Save the current file"
+msgstr "l'hora actual"
+
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "l'hora actual"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "_Envia"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Remitent"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Remitent"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send the message now"
-msgstr "Envia aquest missatge"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Mostra/amaga les adjuncions"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostra les _adjuncions"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "Mostra les _adjuncions"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "S'est� enviant el missatge sense cap asuumpte"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "S'est� enviant el missatge sense cap asuumpte"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "adjunci�"
+
+#: ui/evolution-message-composer.xml.h:43
 #, fuzzy
 msgid "_Bcc Field"
 msgstr "Camps"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 #, fuzzy
 msgid "_Cc Field"
 msgstr "Camps"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
 #, fuzzy
+msgid "_Delete all"
+msgstr "_Suprimeix"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+#, fuzzy
 msgid "_Insert"
 msgstr "_�ndex"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
 msgstr "_Obre..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Respon"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Ajuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Afegeix una carpeta a la llista de carpetes a qu� estic subscrit"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "C_arpeta"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Refresca la llista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Refresca la llista de carpetes"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina la carpeta de la llista de carpetes a qu� estic subscrit"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscriu-me"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Cancel�la la subscripci�"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-#, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_Tasca (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-#, fuzzy
-msgid "Meeting Re_quest (FIXME)"
-msgstr "FIXME: Pe_tici� de cita"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-#, fuzzy
-msgid "Redo"
-msgstr "R�dio"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "Elimina una acci�"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "Replace"
-msgstr "Respon"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Replace a string"
-msgstr "_Cerca contactes"
+msgid "Cancel Task"
+msgstr "Tasca"
 
-#: ui/evolution-task-editor-dialog.xml.h:47
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "Reply to A_ll (FIXME)"
-msgstr "Respon a tots"
+msgid "Delegate Task"
+msgstr "Suprimeix la tasca"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Re_fresh Task"
+msgstr "Refresca la llista"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-#, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de di�leg"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-#, fuzzy
-msgid "Search again for the same string"
-msgstr "_Cerca contactes"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-#, fuzzy
-msgid "Search for a string"
-msgstr "_Cerca contactes"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-#, fuzzy
-msgid "Undo"
-msgstr "_Envia"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Undo the last action"
-msgstr "Elimina una acci�"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (FIXME)"
+msgid "Copy selected task"
+msgstr "Obre la tasca"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "Marca com a completa"
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-msgid "_Reply (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Cut selected task"
+msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "Create a new task"
-msgstr "Crea un nou contacte"
+msgid "Delete selected tasks"
+msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
+
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Save task as something else"
 msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Preferences..."
-msgstr "Prefer�ncies de l'agenda..."
+msgid "Tasks Settings"
+msgstr "_Par�metres"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
@@ -8839,249 +11820,372 @@ msgstr "Tasca"
 msgid "About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:2
 #, fuzzy
-msgid "Close this window"
-msgstr "Suprimeix aquesta cita"
+msgid "Add to _Shortcut Bar"
+msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-#, fuzzy
-msgid "Customize"
-msgstr "Cerca personalitzada"
-
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr ""
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copia a la carpeta"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "_Crea una carpeta nova..."
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Elimina aquesta drecera de la barra de dreceres"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creaci� d'una nova carpeta"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Suprimeix aquest element"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostra una altra carpeta"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "S_urt"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _dreceres de l'Evolution"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Per _comen�ar"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr ""
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Obre'l en una nova finestra"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Envia aquest missatge"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "M�bil"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Utilitzaci� del gestor de c_ontactes"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Utilitzaci� de l'_agenda"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Utilitzaci� del _gestor de correu"
 
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "Work Offline"
-msgstr "S'est� movent"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "_Accions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contacte (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Copia"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_�ndex"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mou"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nou"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Tanca..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Mostra la barra de _dreceres"
+
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Tasca (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "S'est� movent"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Par�metres"
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Adre�a"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Empresa"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipus de tel�fon"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Remitent"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "_Estat:"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Assumpte"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Missatge"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "categories"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr "Tentatiu"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Cap informaci�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Opcions"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nom�s les hores de treball"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "Tria autom�tica"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuni�:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Tots els assistents"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Avui"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -9089,23 +12193,110 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "setmana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Tasca"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Opcions"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nou"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Error desconegut: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Altres"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Contacta l'editor"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
 
-#: widgets/misc/e-filter-bar.c:317
+#: widgets/misc/e-filter-bar.h:102
+#, fuzzy
+msgid "Show All"
+msgstr "Mostra"
+
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
-msgid "Advanced ..."
+msgid "Advanced..."
 msgstr "Afegeix..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -9118,6 +12309,11 @@ msgstr "Cap informaci�"
 msgid "Warning"
 msgstr "S'est� movent"
 
+#: widgets/misc/e-messagebox.c:166
+#, fuzzy
+msgid "Error"
+msgstr "Cap error"
+
 #: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
@@ -9134,74 +12330,667 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Cerca"
 
-#: views/addressbook/galview.xml.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-msgid "Adress Cards"
-msgstr "Adre�a"
+msgid "The Personal Addressbook Server"
+msgstr "Afegeix una font"
 
-#: views/addressbook/galview.xml.h:2
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-msgid "By Company"
-msgstr "Empresa"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: views/addressbook/galview.xml.h:3
+#: wombat/wombat.c:185
 #, fuzzy
-msgid "Phone List"
-msgstr "Tipus de tel�fon"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: views/mail/galview.xml.h:1
+#: wombat/wombat.c:198
 #, fuzzy
-msgid "By Sender"
-msgstr "Remitent"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: views/mail/galview.xml.h:2
 #, fuzzy
-msgid "By Status"
-msgstr "_Estat:"
+#~ msgid "Set task view preferences"
+#~ msgstr "Modifica les prefer�ncies"
 
-#: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Subject"
-msgstr "Assumpte"
+#~ msgid "TasksPreferences"
+#~ msgstr "Prefer�ncies de l'agenda..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactes..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Empresa:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Com a _Minicards"
+
+#~ msgid "As _Table"
+#~ msgstr "Com a _taula"
 
-#: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "Messages"
-msgstr "_Missatge"
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Ha estat impossible obrir aquesta llibreta d'adreces.\n"
+#~ "Aix� pot ser perqu�, o b� heu introdu�t un URI incorrecte,\n"
+#~ "o b� heu intentat accedir a un servidor LDAP sense tenir\n"
+#~ "compilat el suport per a LDAP. Si heu introdu�t un URI,\n"
+#~ "comproveu que sigui correcte i torneu-lo a introduir. Altrament,\n"
+#~ "segurament heu intentat accedir a un servidor LDAP. Si\n"
+#~ "voleu poder utilitzar LDAP, necessitareu descarregar i instal�lar\n"
+#~ "l'OpenLDAP i recompilar i instal�lar l'Evolution.\n"
+
+#~ msgid "Find..."
+#~ msgstr "Cerca..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Obre l'agenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Desa l'agenda"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Les alarmes es desactiven despr�s de"
+
+#~ msgid "Colors"
+#~ msgstr "Colors"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Habilita l'snoozing per a"
+
+#~ msgid "Highlight"
+#~ msgstr "Ressalta"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Elements que vencen avui:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elements que encara no han ven�ut"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elements que encara no han ven�ut:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Elements que ja han ven�ut:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaskPad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Temps fins al venciment"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuals"
+
+#~ msgid "Work week"
+#~ msgstr "Setmana de treball"
+
+#~ msgid "Edit Task"
+#~ msgstr "Edita la tasca"
 
-#: views/tasks/galview.xml.h:2
 #, fuzzy
-msgid "With Category"
-msgstr "categories"
+#~ msgid "Percent complete"
+#~ msgstr "Marca la tasca com a completa"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marca la tasca com a completa"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-msgid "The Personal Addressbook Server"
-msgstr "Afegeix una font"
+#~ msgid "Edit this task..."
+#~ msgstr "Edita aquest element..."
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
+#, fuzzy
+#~ msgid "Edit the task"
+#~ msgstr "Edita la tasca"
 
-#: wombat/wombat.c:173
 #, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Go to Today"
+#~ msgstr "V�s a avui"
 
-#: wombat/wombat.c:185
 #, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Suprimeix-ne totes les aparicions"
 
-#: wombat/wombat.c:198
 #, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Component successfully updated."
+#~ msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
+
+#, fuzzy
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "No s'ha pogut crear una agenda a `%s'"
+
+#, fuzzy
+#~ msgid "Component successfully deleted."
+#~ 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"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Tots els assistents"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Tots els assistents"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr "Cancel�lat"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "Organitzaci�:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Temes fonamentals sobre les cites"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data d'_inici:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Visualitza la carpeta seleccionada"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "adjunci�"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "Envia \"%s\""
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer de signatura %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Aquest fitxer no �s habitual."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Aquest fitxer existeix per� no es pot llegir."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Aquest fitxer sembla accessible per� n'ha fallat l'obertura(2)."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "El fitxer �s molt gran (m�s de 100 kB).\n"
+#~ "Segur que voleu inserir-lo?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "S'est� recollint el correu des de %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Tanca"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "V�s a l'element anterior"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "V�s a l'element seg�ent"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "R_esum"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenvia-ho a l'adre�a"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "no �s"
+
+#, fuzzy
+#~ msgid "Is"
+#~ msgstr "Si"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "VFolder sobre l'assumpte"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "VFolder sobre el remitent"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "VFolder sobre els destinataris"
+
+#, fuzzy
+#~ msgid "Mark as Read"
+#~ msgstr "Mar_ca'l com a llegit"
+
+#, fuzzy
+#~ msgid "Move to Folder..."
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copia a la carpeta"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Canvia la carpeta \"%s\" al format \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "S'est� tancant la carpeta actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "S'est� canviant el nom de la carpeta antiga i obrint-la"
+
+#~ msgid "Copying messages"
+#~ msgstr "C�pia de missatges"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "S'est� recuperant el missatge n�mero %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "S'est� recuperant el missatge %d de %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "S'ha escrit un missatge incomplet al conducte!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (missatge reenviat)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Re: (sense assumpte)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Missatge reenviat (sense assumpte)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimeix el missatge seleccionat"
+
+#~ msgid "Delete this message"
+#~ msgstr "Suprimeix aquest missatge"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Els fitxers de l'Evolution s'han instal�lat amb �xit."
+
+#~ msgid "Activate"
+#~ msgstr "Activa"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activa aquesta drecera"
+
+#~ msgid "Find a contact"
+#~ msgstr "Cerca un contacte"
+
+#~ msgid "View All"
+#~ msgstr "Visualitza'ls tots"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualitza tots els contactes"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dies"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crea una nova agenda"
+
+#~ msgid "Day"
+#~ msgstr "Dia"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Nova a_genda"
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "_Obre una agenda"
+
+#~ msgid "Prev"
+#~ msgstr "Anterior"
+
+#, fuzzy
+#~ msgid "Save calendar as something else"
+#~ msgstr "Deixa l'agenda com a alguna altra cosa"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Obre una agenda"
+
+#, fuzzy
+#~ msgid "About this application"
+#~ msgstr "Autenticaci�:"
+
+#, fuzzy
+#~ msgid "About..."
+#~ msgstr "Lletra..."
+
+#, fuzzy
+#~ msgid "Actio_ns"
+#~ msgstr "_Accions"
+
+#, fuzzy
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "FIXME: _Llibreta d'adreces..."
+
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "Agenda"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "Clear the selection"
+#~ msgstr "_Inverteix la selecci�"
+
+#, fuzzy
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Copia a la carpeta"
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "FIXME: Pr_imer element de la carpeta"
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "V�s a l'element seg�ent"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "V�s a l'element anterior"
+
+#, fuzzy
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "N_ext"
+#~ msgstr "Seg�ent"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Ant_erior"
+
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "Imprimeix..."
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "Seleccioneu una carpeta"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "_Quant a l'Evolution..."
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "FIXME: _�ltim element de la carpeta"
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "Missatge de _correu (FIXME)"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "Afegeix una font"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "Crea un nou contacte"
+
+#, fuzzy
+#~ msgid "New Mail"
+#~ msgstr "Recupera el correu"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "Mou a la carpeta"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copia el missatge a una nova carpeta"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Esborra"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Reenvia un missatge sense cap assumpte"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Suprimeix el missatge"
+
+#, fuzzy
+#~ msgid "Invert Selection"
+#~ msgstr "_Inverteix la selecci�"
+
+#, fuzzy
+#~ msgid "Mark As Read"
+#~ msgstr "Mar_ca'l com a llegit"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marca'l com a per _llegir"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mou un missatge a una nova carpeta"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualitzaci� d'impressi� del missatge..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimeix el missatge a la impressora"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "Respon a tots"
+
+#, fuzzy
+#~ msgid "Reply to sender"
+#~ msgstr "Respon al remitent"
+
+#, fuzzy
+#~ msgid "S_ource"
+#~ msgstr "Font"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Envia el correu de la cua i recupera'n el nou"
+
+#, fuzzy
+#~ msgid "_Reply"
+#~ msgstr "Respon"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "_Anomena i desa..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_En cadena"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Desa a la _carpeta..."
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Envia aquest missatge"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "FIXME: Pe_tici� de cita"
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "R�dio"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Elimina una acci�"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Respon"
+
+#, fuzzy
+#~ msgid "Replace a string"
+#~ msgstr "_Cerca contactes"
+
+#, fuzzy
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Respon a tots"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "Search again for the same string"
+#~ msgstr "_Cerca contactes"
+
+#, fuzzy
+#~ msgid "Search for a string"
+#~ msgstr "_Cerca contactes"
+
+#, fuzzy
+#~ msgid "Undo"
+#~ msgstr "_Envia"
+
+#, fuzzy
+#~ msgid "Undo the last action"
+#~ msgstr "Elimina una acci�"
+
+#, fuzzy
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Marca com a completa"
+
+#, fuzzy
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _dreceres de l'Evolution"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "Afegeix..."
 
 #, fuzzy
 #~ msgid "Click here to add a contact"
@@ -9231,10 +13020,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "El n�mero de port de l'URL `%s' no �s num�ric"
 
 #, fuzzy
-#~ msgid "Secure IMAPv4"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
@@ -9268,15 +13053,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Aquesta opci� us connectar� al sevidor POP mitjan�ant una contrasenya en "
 #~ "text net. �s l'�nica suportada per molts servidors POP."
 
-#~ msgid "Remove action"
-#~ msgstr "Elimina una acci�"
-
 #~ msgid "Remove criterion"
 #~ msgstr "Elimina un criteri"
 
-#~ msgid "Source"
-#~ msgstr "Font"
-
 #, fuzzy
 #~ msgid "Unspecified"
 #~ msgstr "Especifiqueu la cap�alera"
@@ -9285,10 +13064,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Advanced"
 #~ msgstr "Afegeix..."
 
-#, fuzzy
-#~ msgid "Check settings"
-#~ msgstr "Par�metres de prova"
-
 #~ msgid "Email address:"
 #~ msgstr "Adre�a electr�nica:"
 
@@ -9297,10 +13072,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Configuraci� del correu"
 
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nom d'usuari:"
-
-#, fuzzy
 #~ msgid "IMAP"
 #~ msgstr "IMAPv4"
 
@@ -9309,10 +13080,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "No suprimeixis els missatges del servidor"
 
 #, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correu"
-
-#, fuzzy
 #~ msgid "Mail Account"
 #~ msgstr "cont�"
 
@@ -9321,10 +13088,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Configuraci� del correu"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Opcions"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Contrasenya"
 
@@ -9345,18 +13108,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Desa com a VCard"
 
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
 #~ msgid "Server type:"
 #~ msgstr "Servidor:"
 
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Transparent"
 
@@ -9375,13 +13130,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "Desconegut"
 
-#~ msgid "No GPG/PGP program available."
-#~ msgstr "No hi ha cap programa GPG/PGP disponible."
-
-#, fuzzy
-#~ msgid "Message _Display"
-#~ msgstr "Esborra la visualitzaci� del missatge"
-
 #, fuzzy
 #~ msgid "_Compose"
 #~ msgstr "Redacta"
@@ -9394,10 +13142,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#, fuzzy
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Fitxers de correu en format mbox d'UNIX"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
@@ -9409,20 +13153,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Connect to server"
 #~ msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#~ msgid "New"
-#~ msgstr "Nou"
-
 #, fuzzy
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#~ msgid "Disabled"
-#~ msgstr "Inhabilitat"
-
 #~ msgid "Synchronize"
 #~ msgstr "Sincronitza"
 
@@ -9441,9 +13175,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Autor original:"
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9531,19 +13262,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit this appointment..."
 #~ msgstr "Edita aquesta cita..."
 
-#, fuzzy
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Les carpetes Mbox no es poden imbricar."
-
 #~ msgid "Enter the identity you wish to send this message from"
 #~ msgstr "Introdu�u la identitat amb la qual voleu enviar aquest missatge"
 
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Introdu�u l'assumpte del correu"
 
-#~ msgid "Saving changes to message..."
-#~ msgstr "S'estan desant els canvis al missatge..."
-
 #~ msgid "Save changes to message..."
 #~ msgstr "Desa els canvis al missatge..."
 
@@ -9553,13 +13277,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Edita una regla de filtre"
 
-#, fuzzy
-#~ msgid "outgoing"
-#~ msgstr "Agrupament"
-
-#~ msgid "Add Rule"
-#~ msgstr "Afegeix una regla"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Afegeix una regla de la VFolder"
 
@@ -9584,20 +13301,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "You have no Outbox configured"
 #~ msgstr "No teniu configurada cap b�stia de sortida"
 
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No s'ha pogut obrir el fitxer %s:\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "Registering local folder"
 #~ msgstr "Creaci� d'una nova carpeta"
 
-#~ msgid "Fetching email from %s"
-#~ msgstr "S'est� recollint el correu des de %s"
-
 #~ msgid "Fetch email from %s"
 #~ msgstr "Recull el correu des de %s"
 
@@ -9616,9 +13323,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "S'est� afegint \"%s\""
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "S'est� afegint un missatge sense cap assumpte"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "S'estan movent els missatges des de \"%s\" cap a \"%s\""
 
@@ -9643,13 +13347,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Carrega la carpeta %s"
 
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error en preparar-se per a %s:\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -9662,12 +13359,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Missatge malm�s de la cadena cursada?"
 
-#~ msgid "Could not create dialog box."
-#~ msgstr "No s'ha pogut crear el quadre de di�leg."
-
-#~ msgid "User cancelled query."
-#~ msgstr "Consulta cancel�lada per l'usuari."
-
 #~ msgid "Examining %s"
 #~ msgstr "S'est� examinant %s"
 
@@ -9858,9 +13549,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Seg�ent"
 
-#~ msgid "Group %i"
-#~ msgstr "Grup %i"
-
 #~ msgid "label26"
 #~ msgstr "etiqueta26"
 
@@ -9882,9 +13570,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Minutes"
 #~ msgstr "Minuts"
 
-#~ msgid "Time"
-#~ msgstr "Temps"
-
 #~ msgid "_Audio"
 #~ msgstr "_�udio"
 
@@ -9901,10 +13586,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "etiqueta21"
 
 #, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Mostra"
-
-#, fuzzy
 #~ msgid "Hide deleted"
 #~ msgstr "Suprimeix"
 
@@ -9916,10 +13597,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Hide from Sender"
 #~ msgstr "Filtre sobre el remitent"
 
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assumpte"
-
 #~ msgid "You have no mail sources configured"
 #~ msgstr "No teniu configurada cap font de correu"
 
@@ -9928,10 +13605,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Propietats de l'adjunci�"
 
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Adre�a electr�nica:"
-
-#, fuzzy
 #~ msgid "Reply-to:"
 #~ msgstr "Respon"
 
@@ -9950,9 +13623,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Signature File"
 #~ msgstr "Fitxer de signatura"
 
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tipus de font del correu:"
 
@@ -10009,9 +13679,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "Edita la font"
 
-#~ msgid "Add News Server"
-#~ msgstr "Afegeix un servidor de not�cies"
-
 #~ msgid "Edit News Server"
 #~ msgstr "Edita el servidor de not�cies"
 
@@ -10033,15 +13700,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Mail Transport"
 #~ msgstr "Transport de correu"
 
-#~ msgid "News Servers"
-#~ msgstr "Servidors de not�cies"
-
 #~ msgid "News Sources"
 #~ msgstr "Fonts de not�cies"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Envia els missatges en format HTML"
-
 #, fuzzy
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "Configuraci� del _correu..."
@@ -10069,10 +13730,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: In_complete Task"
 #~ msgstr "FIXME: _Tasca"
 
-#, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Insereix el fitxer..."
-
 #~ msgid "FIXME: Rec_urrence..."
 #~ msgstr "FIXME: Rec_urr�ncia..."
 
@@ -10087,10 +13744,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "R�dio"
 
-#, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "_Tanca..."
-
 #~ msgid "Fi_lter on Sender"
 #~ msgstr "Fi_ltre sobre el remitent"
 
@@ -10150,9 +13803,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "Element per fer que encara no ha ven�ut:"
 
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Element per fer que ven� avui:"
-
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Element endarrerit encara per fer:"
 
@@ -10210,9 +13860,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "today"
 #~ msgstr "avui"
 
-#~ msgid "last"
-#~ msgstr "�ltim"
-
 #~ msgid "this"
 #~ msgstr "aquest"
 
@@ -10225,9 +13872,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "third"
 #~ msgstr "tercer"
 
-#~ msgid "fourth"
-#~ msgstr "quart"
-
 #~ msgid "fifth"
 #~ msgstr "cinqu�"
 
@@ -10237,9 +13881,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "seventh"
 #~ msgstr "set�"
 
-#~ msgid "eighth"
-#~ msgstr "vuit�"
-
 #~ msgid "ninth"
 #~ msgstr "nov�"
 
@@ -10252,9 +13893,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "twelfth"
 #~ msgstr "dotz�"
 
-#~ msgid "ago"
-#~ msgstr "fa"
-
 #~ msgid "Year:"
 #~ msgstr "Any:"
 
@@ -10267,12 +13905,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Quan feu clic sobre un dia, anireu a parar\n"
 #~ "a aquella data."
 
-#~ msgid "Mail Source"
-#~ msgstr "Font del correu"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Envia un missatge sense assumpte"
-
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Esborra \"%s\""
 
@@ -10329,9 +13961,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Clearing message display"
 #~ msgstr "S'est� esborrant la visualitzaci� del missatge"
 
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Visualitza l'UID del missatge \"%s\""
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
@@ -10416,9 +14045,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Weeks start on"
 #~ msgstr "La setmana comen�a el"
 
-#~ msgid "Day range"
-#~ msgstr "Abast de dies"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10430,12 +14056,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "vistes de dia i de setmana. Per defecte, les\n"
 #~ "hores fora d'aquest abast no es mostraran."
 
-#~ msgid "Day end:"
-#~ msgstr "Final del dia:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Colors per a la visualitzaci�"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Mostra-ho a la llista de coses per fer:"
 
@@ -10454,9 +14074,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Preferences"
 #~ msgstr "Prefer�ncies"
 
-#~ msgid "Alarm Properties"
-#~ msgstr "Propietats de l'alarma"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Fes un so en visualitzar les alarmes"
 
@@ -10531,18 +14148,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "No es coneix cap protocol per obrir l'URI '%s'"
 
-#~ msgid "Forward Message"
-#~ msgstr "Reenvia el missatge"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copia el missatge"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Crea una carpeta nova..."
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Insereix un fitxer com a adjunci�"
 
@@ -10561,9 +14172,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nova cita per a _avui..."
 
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Crea una nova cita per a avui"
-
 #~ msgid "%s%s"
 #~ msgstr "%2$s%1$s"
 
@@ -10600,9 +14208,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-do list"
 #~ msgstr "Llista de coses per fer"
 
-#~ msgid "Edit..."
-#~ msgstr "Edita..."
-
 #~ msgid "Weeks"
 #~ msgstr "Setmanes"
 
@@ -10657,12 +14262,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "label8"
 #~ msgstr "etiqueta8"
 
-#~ msgid "Discard this message?"
-#~ msgstr "Voleu descartar aquest missatge?"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Carrega un missatge desat anteriorment"
-
 #~ msgid "_Format"
 #~ msgstr "_Formata"
 
@@ -10688,15 +14287,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Per afegir una columna a la vostra taula, arrosegue-la\n"
 #~ "a la ubicaci� on voleu que aparegui."
 
-#~ msgid "window1"
-#~ msgstr "finestra1"
-
 #~ msgid "Available fields"
 #~ msgstr "Camps disponibles"
 
-#~ msgid "Show in this order"
-#~ msgstr "Mostra en aquest ordre"
-
 #~ msgid "label2"
 #~ msgstr "etiqueta2"
 
diff --git a/po/da.po b/po/da.po
index d20750bddd..1173af9982 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-05-18 15:23+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-04-21 10:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,11 +14,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabrik til at importere VKort-filer ind i Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importerer VKort-filer ind i Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +34,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +42,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +50,7 @@ msgstr ""
 "\n"
 "Opgivet:     "
 
-#: addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +58,7 @@ msgstr ""
 "\n"
 "Till�g: "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +74,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +82,7 @@ msgstr ""
 "\n"
 "F�dselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +90,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +98,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +106,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +114,7 @@ msgstr ""
 "\n"
 "Vej:     "
 
-#: addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +122,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +130,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +138,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +146,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +154,7 @@ msgstr ""
 "\n"
 "Leveringsm�rke: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +162,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +170,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +178,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +186,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +194,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +202,7 @@ msgstr ""
 "\n"
 "Tidszone: "
 
-#: addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +210,7 @@ msgstr ""
 "\n"
 "Geografisk lokation: "
 
-#: addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +218,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +226,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +234,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +242,7 @@ msgstr ""
 "\n"
 "Enhed:  "
 
-#: addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +250,7 @@ msgstr ""
 "\n"
 "Enhed2: "
 
-#: addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +258,7 @@ msgstr ""
 "\n"
 "Enhed3: "
 
-#: addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +266,7 @@ msgstr ""
 "\n"
 "Enhed4: "
 
-#: addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +274,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3481
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +300,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -300,36 +308,24 @@ msgstr ""
 "\n"
 "Offentlig n�gle: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Flere VKort"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrik til at importere VKort-filer ind i Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importerer VKort-filer ind i Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
@@ -342,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke indl�st\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-tjener"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -358,718 +354,846 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke l�se pilotens adresseapplikationsblok"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "En Bonobo-kontrol for popop af en adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "En Bonobo-kontrol for visning af en adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "En simpel Bonobo kontrol som viser en adressebog."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Kontrol der viser et minikort for Evolutions adressebog."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution adressebogs minikort-viser"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolution komponent for behandling af kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fabrik for kontrol af adressebog minikort"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabrik for adressebogens adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fabrik for adressebogens adressepopop"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fabrik for Evolutions adressebog-komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fabrik for eksempelkontrol for adressebog"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fil"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Ukendt adressebogstype"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Ingen (anonym modus)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Adgangskode"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Ukendt auth type"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "�n"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Undertr�"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Ukendt omr�de-type"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Bind DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "RETMIG: Bind DN-hj�lpetekst ind her"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Husk denne adgangskode"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "V�rt:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Rod-DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "S�geomr�de:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Godkendelse:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Avancerede LDAP-indstillinger"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Sti:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "RETMIG: Hj�lp for stier her?"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Opret sti hvis den ikke eksisterer."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Redig�r adressebog"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Tilf�j adressebog"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"V�lg den type adressebog som du har, og indtast den relvante information om "
+"den."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Navn:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Tilf�j"
+msgid "Addressbook Sources"
+msgstr "Kilder til adressebog"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Slet"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Navn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Tilf�j"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Redig�r"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Indtast adgangskode for %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kunne ikke �bne adressebogen"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Hvilkensomhelst felt indeholder"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Navn indeholder"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Epost indeholder"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Navn indeholder"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Uri'en som mappebladreren vil vise"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Prim�r epost"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Sekund�r epost"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Terti�r epost"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "V�lg fil"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Opret ny kontakt"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Redig�r adressebog"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Redig�r kontaktinfo"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "F�j til kontakter"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Epostadresse:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Deaktiver foresp�rgsler"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Aktiv�r foresp�rgsler (Farligt!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolutions adressebog-komponent"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Fabrik for adressebogens gr�nseflade for navneudv�lgelse"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Fjern alt"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sender post"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Andre kontakter"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Modtagerliste:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "V�lg mappe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "V�lg navn fra:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Kategori:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_S�g"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Br_yllupsdag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "A_rbejde"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax p� arbejde"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontakter..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Gem som:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generel"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Notater:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefontyper"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Prim�r epost"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Vil modtage epost af formatet _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Hjemmeside-adresse:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:84
-msgid "_Add"
-msgstr "_Tilf�j"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Sekret�rs navn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_F�dselsdag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Arbejde"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontakter..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:656 mail/mail-config.glade.h:85
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slet"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Afdeling:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Fulde navn..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Hjemme"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Job titel:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Leders navn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Kalde_navn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "�gte_f�lle:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Dette er postadressen"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Slet kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt tilh�rer disse kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:688
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Sekret�r"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Firma fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Hjem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Hjem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Hjemme fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "Isdn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Andet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Kalder"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Prim�r epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-msgid "Email 2"
-msgstr "Sekund�r epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:681
-msgid "Email 3"
-msgstr "Terti�r epost"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slet kontakt?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Redig�r alt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Fuldt navn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Tjek adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_By:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tjek fulde navn"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Fr�ken"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Hr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Fru"
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Frk."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Efternavn:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Mellemnavn:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr "Som _minikort"
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Som _tabel"
-
-#: addressbook/gui/component/addressbook.c:408
-#, c-format
-msgid "Enter password for %s"
-msgstr "Indtast adgangskode for %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "V�rt:"
 
-#: addressbook/gui/component/addressbook.c:436
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke �bne adressebogen"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "december"
 
-#: addressbook/gui/component/addressbook.c:443
-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"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook.c:448
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:456
-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:616 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "Hvilkensomhelst felt indeholder"
-
-#: addressbook/gui/component/addressbook.c:617
-msgid "Name contains"
-msgstr "Navn indeholder"
-
-#: addressbook/gui/component/addressbook.c:618
-msgid "Email contains"
-msgstr "Epost indeholder"
-
-#: addressbook/gui/component/addressbook.c:761
-msgid "The URI that the Folder Browser will display"
-msgstr "Uri'en som mappebladreren vil vise"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fil"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Ukendt adressebogstype"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ingen (anonym modus)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
-msgid "Password"
-msgstr "Adgangskode"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Ukendt auth type"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "�n"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Undertr�"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Ukendt omr�de-type"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "RETMIG: Bind DN-hj�lpetekst ind her"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:60
-msgid "Remember this password"
-msgstr "Husk denne adgangskode"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:33
-msgid "Host:"
-msgstr "V�rt:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Fjern"
 
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Kontaktredigering"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Root DN:"
-msgstr "Rod-DN:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Kontaktredigering"
 
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "S�geomr�de:"
-
-#: addressbook/gui/component/addressbook-config.c:477
-msgid "Authentication:"
-msgstr "Godkendelse:"
-
-#: addressbook/gui/component/addressbook-config.c:499
-msgid "Advanced LDAP Options"
-msgstr "Avancerede LDAP-indstillinger"
-
-#: addressbook/gui/component/addressbook-config.c:520
-#: mail/mail-config.glade.h:53
-msgid "Path:"
-msgstr "Sti:"
-
-#: addressbook/gui/component/addressbook-config.c:521
-msgid "FIXME Path Help text here"
-msgstr "RETMIG: Hj�lp for stier her?"
-
-#: addressbook/gui/component/addressbook-config.c:526
-msgid "Create path if it doesn't exist."
-msgstr "Opret sti hvis den ikke eksisterer."
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid "Edit Addressbook"
-msgstr "Redig�r adressebog"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Add Addressbook"
-msgstr "Tilf�j adressebog"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Opprinnelig forfatter:"
 
-#: addressbook/gui/component/addressbook-config.c:680
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"V�lg den type adressebog som du har, og indtast den relvante information om "
-"den."
 
-#: addressbook/gui/component/addressbook-config.c:686
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "Navn:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook-config.c:687
-msgid "FIXME Name help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:689
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: addressbook/gui/component/addressbook-config.c:690
-msgid "FIXME Description help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Kilder til adressebog"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
-#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Slet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "Edit"
-msgstr "Redig�r"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Deaktiver foresp�rgsler"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Aktiv�r foresp�rgsler (Farligt!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Redig�r kontaktinfo"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "F�j til kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "En Bonobo-kontrol for popop af en adresse."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "En Bonobo-kontrol for visning af en adresse."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "En simpel Bonobo kontrol som viser en adressebog."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrol der viser et minikort for Evolutions adressebog."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adressebogs minikort-viser"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent for behandling af kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabrik for kontrol af adressebog minikort"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabrik for adressebogens adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabrik for adressebogens adressepopop"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabrik for Evolutions adressebog-komponent."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabrik for eksempelkontrol for adressebog"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Fjern"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Fjern alt"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolutions adressebog-komponent"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabrik for adressebogens gr�nseflade for navneudv�lgelse"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Find..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Modtagerliste:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "V�lg mappe"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "V�lg navn fra:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Foresatte"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "S�g"
 
@@ -1183,168 +1307,264 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:525
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Send contact to other"
 msgstr "Send _kontaktperson til andre..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Ny _meddelelse til kontaktperson"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:588 mail/message-browser.c:199
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Udskriv"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Skriv kuvert..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Fejl under indl�sning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Kilder"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Ukendt fejl"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Arbejd uden net"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Adgang n�gtet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Fil ikke fundet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operationen er ikke underst�ttet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Afbrudt"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/U-fejl"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Fejl under indl�sning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Fejl under indl�sning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Fejl under indl�sning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Fejl under indl�sning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Fejl under indl�sning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilf�je en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Prim�r epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Sekret�r"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Tilbagering"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Firma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Hjem 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Hjem 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Anden adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:682
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Websted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:683
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:684
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:685
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:686
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:687
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Foresatte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:689
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:690
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Samlever"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Bem�rkning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:692
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Ledig-optaget URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "F�rdig"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Indl�ser kalender..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1387,7 +1607,8 @@ msgid "Dimensions:"
 msgstr "Dimensioner:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Skrifttype..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1447,7 +1668,6 @@ msgid "Margins"
 msgstr "Marginer"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
@@ -1527,37 +1747,62 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Bredde:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Skrifttype..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke l�se pilotens kalenderapplikationsblok"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke l�se pilotens applikationsblok for opgaveliste"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "P�mindelse om din aftale "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "En simpel Bonobo kontrol som viser en kalender."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Uds�t"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution kalender eksekutivoversigt-komponent."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "O.k."
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalender ITip/iMip fremviser"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution-komponent for behandling af kalenderen."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Fabrik for kalenderoversigts-komponenten."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Fabrik for evolutions kalenderkomponent."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Fabrik for kalenderens iTip visningskontrol"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fabrik for eksempelkontrol for kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabrik for evolutions kalenderkomponent."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1567,142 +1812,256 @@ msgstr "Alarm-notificeringstjeneste"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Vis information om Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm p� %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Luk"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Uds�t"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Uds�t-tid (minutter)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Redig�r aftale"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Intet sammendrag."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "P�mindelse om din aftale "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Uds�t"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "O.k."
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Kunne ikke initiere Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Fil ikke fundet"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A den %e. %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "�bn kalender"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Gem kalender"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%a %d %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalender-visning. Tjek venligst din ops�tning af ORBit og "
 "OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukendt fejl"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "H�j"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:687
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Gennemsigtig"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Uigennemsigtig"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Under udarbejdelse"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Afbrudt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1713,7 +2072,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1721,17 +2080,21 @@ msgstr ""
 "'Ingen'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1199
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1741,118 +2104,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentv�rdien skal v�re mellem 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteten skal v�re en af 'H�j', 'Normal', 'Lav' eller 'Udefineret'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Gennemsigtigheden skal v�re en af 'Gennemsigtig', 'Uigennemsigtig' eller "
 "\"Ingen'."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Gentages"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nej"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A den %e. %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Kortvisning"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Aftaler"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Arbejds_uge"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%H:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Uge"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Opgaver"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "M�ned"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fejl ved indl�sning af kalender</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fejl ved indl�sning af kalender:<br>Metode ikke underst�ttet"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Lyd-alarmer"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
-msgid "Display"
-msgstr "Vis"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Modtagerliste:"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Vis aftaler"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Vis valgmuligheder"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Vis opgaver"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Opgaver der skal fuldf�res"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Indl�ser kalender"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#, fuzzy
+msgid "Alarm Repeat"
+msgstr "Egenskaber"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm p� %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Beskeder"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Afspil lyd/sang"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Intet sammendrag."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Luk"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "K�_r program"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Redig�r aftale"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Uds�t-tid (minutter)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dage"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "_Opdat�r hver"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "timer"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutter"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d dage"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 dag"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d uger"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 uge"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d timer"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 time"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutter"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minut"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d sekunder"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 sekund"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Afspil lyd/sang"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "den aktuelle tid"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Send besked"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "K�_r program"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " f�r begyndelse p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " efter begyndelse p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " f�r slutning p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " efter slutning p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Dato & tidspunkt"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "P�mindelser"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Sammendrag:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Alternativer"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "efter"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "f�r"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dag(e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "slut p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "time(r)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minut(ter)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "start p� aftale"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1883,36 +2423,40 @@ msgid "60 minutes"
 msgstr "60 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmer afbrydes efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pip n�r alarmvinduet kommer til syne."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Ops�tning af kalender"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Oppgavelisteoppf�ring som g�r ut idag:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farver"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "(Ingen mappe vist)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Sammenpres weekender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Alternativer for datonavigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1920,583 +2464,1085 @@ msgid "Defaults"
 msgstr "Forvalg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis valgmuligheder"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "F�rdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Sl� uds�ttelse til for"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dagen slutter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Ugens f�rste dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Fremh�v:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Punkter som skal afsluttes idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Punkter som skal afsluttes idag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Punkter som ikke skal afsluttes endnu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Punkter som ikke skal afsluttes endnu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "man"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Overskredne opgaver"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Overskredne opgaver:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:54
-msgid "Pick a color"
-msgstr "V�lg en farve"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioritet"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Overskredne opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "P�mind mig om alle aftaler"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "P�mindelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "l�r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "l�rdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Vis sluttider for aftaler"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Vis ugenumre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Dagens starter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "s�n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "s�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Opgaveblok"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Punkter som skal afsluttes idag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid til afslutning"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Tidsopdeling:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Tidszone: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "tir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "tirsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbejdsuge"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Arbejds_uge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutter f�r de skal ske."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:88
-msgid "seconds."
-msgstr "sekunder."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Er du sikker p� at du vil slette denne konto?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Er du sikker p� at du vil slette journalindgangen '%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr "for"
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Fuldf�rt"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Fuldf�rt"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "F�rdig-dato"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Redig�r aftale"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Aftale - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Opgave - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journalpunkt - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"En fil med samme navn eksisterer allerede.\n"
+"Overskriv den?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Gem som..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne aftale?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne opgave?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker p� at du vil slette journalindgangen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne journalindgang?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�nsker du at gemme �ndringer?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Er du sikker p� at du vil slette aftalen '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "Redig�r opgave"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "Aftale - %s"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Er du sikker p� at du vil slette journalindgangen '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "Opgave - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "V�lg fil"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journalpunkt - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sektioner:"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Ingen sammendrag"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Tidszone: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% f�rdi_g:"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Aftale"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "P�mindelse"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Gentagelse"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Annull�r m�de"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Varer he_le dagen"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassificering"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Dato & tidspunkt"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Fuldf�rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Fremskridt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Opgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontakter..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "S_lut-tid:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Slut-_dato:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritet:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenavn:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Kategorier"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kilder"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Formand"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "N�dvendig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Mulig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Ikke-deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Udf�r handlinger"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Accept�r "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Afvis "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Slettet"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Under udarbejdelse"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "N�dvendig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Mulig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Ikke-deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Sendt"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Slet..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Deltager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "F�rdigg�relsesdato"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Slutdato"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Slettet"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Startdato"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Slettet"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Geografisk position"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Foresatte"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Procent f�rdig"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "december"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Sammendrag"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "S.U."
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Gennemsigtighed"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rolle"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URI"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmer"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Arrang�r:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Arrang�r:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Indvit�r andre..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Arrang�r:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "p�"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "h�ndelser"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Egendefineret genindtr�ffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Hver"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Undtagelser"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Ingen genindtr�ffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Smugkig"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regel for genindtr�ffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Simpel genindtr�ffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "�ndr"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "for"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "for evigt"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "m�ned(er)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "til"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "uge(r)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "�r"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "�nsker du at gemme �ndringer?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Fuldf�rt dato:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Slettet"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Slettet"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Ingen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Opgave"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% f�rdi_g:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Fremskridt"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Sta_rt dato:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "Slut-_dato:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioritet:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Status:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Mark�r som fuldf�rt"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_�bn"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:552
-msgid "Mark the task complete"
-msgstr "Mark�r opgaven som fuldf�rt"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopi�r"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "�ndr denne opgave..."
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Inds�t"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "�ndr denne opgave"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Slet denne opgave"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Mark�r som fuldf�rt"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Slet opgaven"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr " "
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% f�rdi_g:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmer"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "F�rdig"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "F�rdigg�relsesdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "F�rdig-dato"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Slutdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografisk position"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Startdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Opgaver"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Gennemsigtighed"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URI"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr " "
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr " "
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Ny aftal_e"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "G� til i dag"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "G� _til idag"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "G� til dato..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "�bn"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Fjern denne aftale"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Planl�g m�de"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Gem aktiv fil"
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
-msgstr ""
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Slet alle opf�ringer"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
-msgstr ""
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Slet alle opf�ringer"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Dette er postadressen"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Den fil eksisterer men kan ikke l�ses."
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kunne ikke l�se din kalenderfil!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dette er et svar fra nogen som ikke er inviteret!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Kunne ikke opdatere dit kalenderlager."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Kunne ikke slette kalenderkomponenten!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Sletning af komponent fuldf�rt."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Kan ikke genkende denne type kalenderkomponent."
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Tilf�j til Kalender"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Accept�r "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Mappen set ud til at v�re uigenkaldeligt �delagt."
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Afvis "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Opdat�r kalender"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Annull�r m�de"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Kunne ikke l�se din kalenderfil!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2511,26 +3557,22 @@ msgstr "--til--"
 msgid "Calendar Message"
 msgstr "Kalenderbesked"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:632
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Dato:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Indl�ser kalender"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Indl�ser kalender..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Arrang�r:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server-melding:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sammendrag:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "dagen begynder"
@@ -2539,415 +3581,48 @@ msgstr "dagen begynder"
 msgid "date-start"
 msgstr "dagen slutter"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Deltagers adresse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Deltagere:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Annull�r\n"
-"m�de"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Formand"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Invitationer til m�de"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ikke-deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Mulig deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Arrang�r:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Offentligg�r\n"
-"arrangement"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "S.U."
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Anmod\n"
-"om m�de"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "N�dvendig deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rolle"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Afs�t\n"
-"tid"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1081
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indl�se opgaverne i '%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden der kr�ves for at indl�se '%s' er ikke underst�ttet"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Redig�r aftale"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "p�"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "h�ndelser"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr " %d dage"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 dag"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d uger"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 uge"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d timer"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 time"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutter"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 minut"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekunder"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 sekund"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "Afspil lyd/sang"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "Vis dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "Send besked"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "K�_r program"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr " f�r begyndelse p� aftale"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr " efter begyndelse p� aftale"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr " f�r slutning p� aftale"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr " efter slutning p� aftale"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Grundl�ggende om aftaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Egendefineret genindtr�ffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Undtagelser"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "�ndr"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Ingen genindtr�ffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Smugkig"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Gentagelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regel for genindtr�ffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "P�mindelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Indstillinger..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Simpel genindtr�ffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lut-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "efter"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "f�r"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dag(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "slut p� aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "for"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "for evigt"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "time(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
-msgid "minute(s)"
-msgstr "minut(ter)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "m�ned(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "start p� aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "til"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "uge(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "�r"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Ny aftale..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Slet alle opf�ringer"
-
 #. 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %b"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/gnome-cal.c:236
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Comment contains"
-msgstr "Navn indeholder"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "Har kategori"
+msgid "New _Appointment..."
+msgstr "Ny aftale..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er n�dvendig for at �bne `%s' er ikke st�ttet"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "En simpel Bonobo kontrol som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender eksekutivoversigt-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender ITip/iMip fremviser"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-komponent for behandling af kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabrik for kalenderoversigts-komponenten."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabrik for evolutions kalenderkomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fabrik for kalenderens iTip visningskontrol"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabrik for eksempelkontrol for kalender"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -2969,231 +3644,256 @@ msgid "Go To Date"
 msgstr "G� til dato"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "G� til i dag"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "januar"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "juli"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "juni"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marts"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "G� til i dag"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "s�n"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "man"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "tir"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "ons"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "tor"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "fre"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "l�r"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Opgaver"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "I dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Denne uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Denne m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Dette �r (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1560
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Udskriv denne ting"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Skriverops�tning"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI for opgavemappen der skal vises"
 
@@ -3237,96 +3937,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr ""
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
 #: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
@@ -3352,64 +3962,81 @@ msgstr "Den angivne type er ikke underst�ttet i denne gemning"
 msgid "Decryption is not supported by this cipher"
 msgstr "Den angivne type er ikke underst�ttet i denne gemning"
 
-#: camel/camel-disco-store.c:271
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+#, fuzzy
+msgid "Resynchronizing with server"
+msgstr "Synkroniserer mappe"
+
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
-msgstr ""
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "Fejlede ved besked %d af %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "F�rdig"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fejlede ved besked %d af %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3441,14 +4068,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i krop-beholder, forventer streng"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke oprette r�r: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke f� fat p� mappe: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke udf�re fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsafbrud ved ventning p� l�sefil for %s. Pr�v igen senere."
@@ -3463,163 +4109,112 @@ msgstr "Kunne ikke f� fat p� l�s ved brug af fcntl(2): %s "
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Kunne ikke f� fat p� l�s ved brug af flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke tjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke �bne postfil %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke �bne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kunne ikke tjekke l�sefil for %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fejl ved l�sning af postfil: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fejl ved skriving af midlertidig fil: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke oprette r�r: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke udf�re fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet mislykkedes: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Ukendt fejl)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Fejl ved l�sning af postfil: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Fejl ved skriving af midlertidig fil: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Indtast venligst din %s adgangskode for %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Indtast venligst din %s adgangskode"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Ingen adgangskode oplyst."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke oprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Klik p� ikonen for at dekryptere."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Ingen modtagere specificeret"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:195
-#, fuzzy, c-format
-msgid "Please enter your password for %s"
-msgstr "Indtast venligst din %s adgangskode for %s"
-
-#: camel/camel-pkcs7-context.c:213 camel/camel-smime-context.c:211
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Fejl under gemning af genveje."
-
-#: camel/camel-pkcs7-context.c:222 camel/camel-smime-context.c:220
-msgid "Invalid password."
-msgstr "Ugyldig adgangskode."
-
-#: camel/camel-pkcs7-context.c:329 camel/camel-smime-context.c:328
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kunne ikke oprette l�sefil for %s: %s"
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kunne ikke oprette l�sefil for %s: %s"
-
-#: camel/camel-pkcs7-context.c:567 camel/camel-smime-context.c:529
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590 camel/camel-smime-context.c:536
-msgid "Could not encrypt: failed to create encryption context."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:620 camel/camel-smime-context.c:571
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kunne ikke koble til tjener: %s."
-
-#: camel/camel-pkcs7-context.c:626 camel/camel-smime-context.c:577
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Kunne ikke oprette r�r: %s"
-
-#: camel/camel-pkcs7-context.c:677 camel/camel-smime-context.c:627
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -3650,7 +4245,7 @@ msgid "Connection cancelled"
 msgstr "Forbindelse annulleret"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
@@ -3659,13 +4254,13 @@ msgstr "Kunne ikke koble til %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(ukendt v�rt)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Handling annulleret"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server frakoblet uventet"
 
@@ -3764,7 +4359,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Forkert autoriseringsbesked fra server."
 
@@ -3834,7 +4429,7 @@ msgstr "For l�sning af e-post som en anmodning p� et andet s�t af mapper"
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilg�ngelig for protokol `%s'"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3843,45 +4438,53 @@ msgstr ""
 "Kan ikke oprette katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:344
-#, fuzzy
-msgid "Could not sign: failed to create content info."
-msgstr "Kan ikke oprette komponeringsvinduet."
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Indtast venligst din %s adgangskode for %s"
 
-#: camel/camel-smime-context.c:351
-msgid "Could not sign: failed to create signing context."
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:357
-#, fuzzy
-msgid "Could not sign: failed to create signature."
-msgstr "Kunne ikke indl�se sammendrag for %s"
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Den fil eksisterer ikke."
 
-#: camel/camel-smime-context.c:384
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Den fil eksisterer ikke."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Kunne ikke oprette l�sefil for %s: %s"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "'clearsign' is not supported by S/MIME."
-msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+msgid "Failed to decode message."
+msgstr "Vedh�ft bilag til meddelelsen"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Papirkurv"
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:348
-#, c-format
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
-msgstr ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Emne er %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3891,24 +4494,29 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:423
-#, fuzzy, c-format
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
-msgstr "Emne er %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen s�dan besked: %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen s�dan besked: %s"
@@ -3920,64 +4528,75 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kan ikke oprette katalog %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Ukendt fejl"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Serversvar afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener indeholdt ikke %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:364
-msgid "Scanning IMAP folder"
-msgstr "Skanner IMAP-mapper"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1047
-#: camel/providers/imap/camel-imap-folder.c:1281
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Gemmer beskeder"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1075
-#: camel/providers/imap/camel-imap-folder.c:1314
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Gemmer beskeder"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Kan ikke oprette katalog %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Tjekker for nyt post"
 
@@ -3985,7 +4604,7 @@ msgstr "Tjekker for nyt post"
 msgid "Check for new messages in all folders"
 msgstr "Tjek for nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:552
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4019,28 +4638,28 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en "
 "klartekst-adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:466
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:505
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:531
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4051,36 +4670,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH-formaterede postkataloger"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "For gemning af lokal e-post i MH-lignende beskedskataloger "
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standard Unix-postkassefil"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "For gemning af lokal e-post i standard mbox format"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir-formaterede postfiler"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "For gemning af lokal e-post i qmail beskedskataloger"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir-formaterede postfiler"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "For gemning af lokal e-post i qmail beskedskataloger"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Gemme-rod %s er ikke en absolut sti"
@@ -4120,24 +4754,24 @@ msgstr "Kunne ikke slette oversigtsfil `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, 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:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4146,18 +4780,19 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Ingen s�dan besked"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Ugyldigt indhold af meddelelse"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4167,14 +4802,14 @@ msgstr ""
 "Kan ikke �bne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4184,22 +4819,29 @@ msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' er ikke et maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4207,11 +4849,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
@@ -4221,9 +4865,12 @@ msgstr "Kan ikke �bne postboks: %s: %s\n"
 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:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4232,11 +4879,13 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen set ud til at v�re uigenkaldeligt �delagt."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fremstilling af besked mislykkedes: Er postkassen �delagt?"
 
@@ -4282,36 +4931,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Laver sammendrag for mappe"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kunne ikke �bne mappe: %s: summerer fra position %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Uoprettelig fejl ved fortolkning af post n�r position %ld i mappe %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lave oversigt over folder: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kunne ikke �bne folder der skal laves oversigt for: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �bne midlertidig postboks: %s"
@@ -4320,21 +4978,28 @@ msgstr "Kan ikke �bne midlertidig postboks: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
@@ -4349,13 +5014,14 @@ msgstr "Kunne ikke lukke midlertidig mappe: %s"
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilf�je besked i mh-mappe: %s: %s"
@@ -4370,39 +5036,95 @@ msgstr "`%s' er ikke et katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Kan ikke tilf�je besked i mbox-filen: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' er ikke en almindelig fil."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Mappen `%s' eksisterer ikke."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Lokale gemmesteder har ikke en indbakke"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Lokal e-post-fil %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Lokale mapper kan ikke v�re rekursive."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Lokale mapper kan ikke v�re rekursive."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Kunne ikke �bne midlertidig postfil %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Kunne ikke lukke kildemappe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Venligst indtast NNTP-adgangskode for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Tjeneren godtog ikke brugernavn"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fejl ved sending af brugernavn til tjener"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Tjeneren godtog ikke brugernavn/adgangskode"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Besked %s ikke fundet"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppeliste fra tjeneren."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke gemme gruppelistefil for %s: %s"
@@ -4417,17 +5139,17 @@ msgstr ""
 "Dette er en udbyder for l�sning af og postning af indl�g til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kunne ikke �bne katalog for news-tjener: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4435,8 +5157,8 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-tjeneren ved brug af klartekst "
 "adgangskode."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke �bne eller oprette .newsrc-fil for %s: %s"
@@ -4487,7 +5209,7 @@ msgstr "Efterlad beskeder p� tjeneren"
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4582,7 +5304,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4636,7 +5358,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4644,122 +5366,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Kommando ikke implimenteret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Hj�lpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Tjeneste parat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Adganggskodeoverf�ring kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kr�ves for forespurgt autenticeringsmekanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticering kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Velkomst fejl ved svar: %s: formentlig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVenligst indtast SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4770,319 +5492,235 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-levering af e-post via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Sender meddelelse"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO anmodning overskred tid: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO fejl ved svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Godkendelse"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldigt svar p� autenticering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM fejl ved svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA fejl ved svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA sending overskred tid: Besked afbrudt: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA fejl ved svar: Besked afbrudt: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-anmodning overskred tid: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET fejl ved svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT-anmodning overskred tid: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT fejl ved svar: %s: ikke-fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Vedh�ft en fil"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte punkter fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Vedh�ft bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Vedh�ft bilag til meddelelsen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
-#: mail/message-list.c:1081
-msgid "Attachment"
-msgstr "Bilag"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Egenskaber for bilag"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-type:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr ""
-
-#: composer/e-msg-composer.c:536
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kunne ikke �bne signaturfilen %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:709
-msgid "Save as..."
-msgstr "Gem som..."
-
-#: composer/e-msg-composer.c:720
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fejl ved gemning af fil: %s"
-
-#: composer/e-msg-composer.c:740
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fejl ved indl�sning af fil: %s"
-
-#: composer/e-msg-composer.c:812
-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:870 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:224
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:876
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne meddelelse er ikke sendt.\n"
-"\n"
-"Vil du gemme �ndringene?"
-
-#: composer/e-msg-composer.c:901
-msgid "Open file"
-msgstr "�bn fil"
-
-#: composer/e-msg-composer.c:1027
-msgid "That file does not exist."
-msgstr "Den fil eksisterer ikke."
-
-#: composer/e-msg-composer.c:1037
-msgid "That is not a regular file."
-msgstr "Dette er ikke en almindelig fil."
-
-#: composer/e-msg-composer.c:1047
-msgid "That file exists but is not readable."
-msgstr "Den fil eksisterer men kan ikke l�ses."
-
-#: composer/e-msg-composer.c:1057
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Den fil s� ud til at v�re tilg�ngelig, men open(2) fejlede."
-
-#: composer/e-msg-composer.c:1079
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Filen er meget stor (mere end 100 k).\n"
-"Er du sikker p� at du �nsker at inds�tte den?"
-
-#: composer/e-msg-composer.c:1100
-msgid "An error occurred while reading the file."
-msgstr "En fejl skete ved l�sning af filen."
 
-#: composer/e-msg-composer.c:1401 composer/e-msg-composer.c:1744
-msgid "Compose a message"
-msgstr "Skriv en meddelelse"
-
-#: composer/e-msg-composer.c:1835
-msgid "Could not create composer window."
-msgstr "Kan ikke oprette komponeringsvinduet."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Klik her for adressebogen"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:753
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:755
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:652
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:757
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerne for meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:759
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Kopi:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "B-kopi:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5090,321 +5728,272 @@ msgstr ""
 "Indtast adresserne som skal modtage en kopi af meddelelsen uden at komme til "
 "syne i meddelelsens modtagerliste."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Vedh�ft en fil"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
+"Could not open file %s:\n"
+"%s"
 msgstr ""
+"Kunne ikke �bne fil `%s':\n"
+"%s"
 
-#: composer/evolution-composer.c:370
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan ikke initiere Evolutions composer."
-
-#: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution gruppevarepakke"
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "Adressekort"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "Kalenderinformation"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr " "
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr " "
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Fejl ved udf�ring af operation:\n"
+"%s"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Gem som..."
 
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Advarsel"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-msgid "%a %m/%d/%Y %H:%M"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr ""
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Fejl ved gemning af fil: %s"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Fejl ved indl�sning af fil: %s"
 
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 msgstr ""
 
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr " "
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Fejl ved gemning af fil: %s"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente besked fra POP-tjener %s: %s"
 
-#: executive-summary/component/e-summary.c:926
-#, c-format
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Unable to seek on file: %s\n"
 "%s"
 msgstr ""
-"Kan ikke �bne HTML-fil:\n"
-"%s"
+"Kunne ikke oprette uddatafil:  %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:940
-#, c-format
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Unable to truncate file: %s\n"
 "%s"
 msgstr ""
+"Kunne ikke oprette uddatafil:  %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "V�lg tjeneste"
-
-#: executive-summary/component/e-summary-callbacks.c:290
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
 msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
+"Fejl ved gemning af beskeder til: %s:\n"
+" %s"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"Denne meddelelse er ikke sendt.\n"
+"\n"
+"Vil du gemme �ndringene?"
 
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Send et brev til %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "�ndr visningen til %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "K�r %s"
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
 
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Luk %s"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "�bn fil"
 
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flyt %s til venstre"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Inds�t tekstfil..."
 
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flyt %s til h�jre"
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Skriv en meddelelse"
 
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Kan ikke oprette komponeringsvinduet."
 
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
+#: composer/evolution-composer.c:359
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigur�r %s"
+#: composer/evolution-composer.c:374
+msgid "Cannot initialize Evolution's composer."
+msgstr "Kan ikke initiere Evolutions composer."
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Evolution gruppevarepakke"
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "Adressekort"
 
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "Kalenderinformation"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-sammendrag"
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr " "
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %Y-%m-%d"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testtjeneste"
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Fejl"
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %Y-%m-%d"
 
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Opdat�r nu"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "_Opdat�r hver"
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutter"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "�r"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "�r"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "m�ned"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "m�neder"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "uge"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "uger"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dage"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "time"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "timer"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekunder"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Du har glemt at v�lge en dato."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Du har valgt en ugyldig dato."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5414,7 +6003,7 @@ msgstr ""
 "n�r filteret k�res eller tiden n�r vMappen\n"
 "�bnes."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5422,7 +6011,7 @@ msgstr ""
 "Beskedens dato vil blive sammenlignet med\n"
 "tiden du angive her."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5433,28 +6022,37 @@ msgstr ""
 "for eksempel \"for en uge siden\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "den aktuelle tid"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "et tidspunkt du angiver"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "et tidspunkt relativt til den aktuelle tid"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Sammenlign med"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "siden"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "siden"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<klik her for at v�lge en mappe>"
 
@@ -5479,8 +6077,8 @@ msgstr ""
 "Du glemte at v�lge en mappe.\n"
 "Venligst g� tilbage og specific�r en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
@@ -5492,46 +6090,6 @@ msgstr "Indtast URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klik her for at v�lge en mappe>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Redig�r filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Redig�r vMapper"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Indkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Udg�ende"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Visuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vMappe-kilder"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "med alle aktive fjernmapper"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "med alle lokale og aktive fjernmapper"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "med alle lokale mapper"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5553,36 +6111,88 @@ msgstr "Regelnavn: "
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Udf�r handlinger"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�dt"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�dt"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Tilf�j kriterie"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "udg�ende"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Tilf�j"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Redig�r"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Redig�r filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Redig�r vMapper"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Indkommende"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Udg�ende"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Visuelle mapper"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vMappe-kilder"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "med alle aktive fjernmapper"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "med alle lokale og aktive fjernmapper"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "med alle lokale mapper"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Giv farve"
 
 #: filter/libfilter-i18n.h:4
@@ -5658,90 +6268,91 @@ msgid "Expression"
 msgstr "Udtryk"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Vigtig"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "er st�rre end"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Diskussionsliste"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Beskeden blev modtaget"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Beskeden blev sendt"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Flyt til folder"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "p� eller efter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "p� eller f�r"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "L�st"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Passer p� regul�rt udtryk"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1081
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "_S�t Status"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "St�rrelse"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "lyder som"
@@ -5762,7 +6373,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1082
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
@@ -5790,246 +6402,263 @@ msgstr "�ndr regel"
 msgid "Score Rules"
 msgstr ""
 
-#: importers/elm-importer.c:512 importers/netscape-importer.c:780
-#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
-#: shell/importer/import.glade.h:4
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import�r"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Epost"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr ""
-
-#: importers/elm-importer.c:528 importers/netscape-importer.c:807
-#: importers/pine-importer.c:668
-msgid "Don't ask me again"
-msgstr ""
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 #, fuzzy
 msgid "Elm mail"
 msgstr "Epost"
 
-#: importers/evolution-gnomecard-importer.c:156
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
+msgstr "Adressebog"
+
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1472
-msgid "Filters"
-msgstr "Filtre"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "Adresseb�ger"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:661
-msgid "Addressbook"
-msgstr "Adressebog"
-
-#: importers/pine-importer.c:705
+#: 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 mail"
 msgstr "Pine-post"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution komponent til h�ndtering af post."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution beskedskriver."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Fabrik for Evolution beskedskriver."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fabrik for Evolution postkomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Konfiguration af epost"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Egenska_ber..."
+
 #: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "�ndr filens egenskaber"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:410
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: mail/folder-browser.c:270
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Egenskaber for \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Egenskaber"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunne ikke oprette midlertidig katalog: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Gem s�gning som vMappe"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "vMappe for _afsender"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "vMappe for _modtagere"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Vfolder efter diskussions_liste"
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r efter emne"
 
-#: mail/folder-browser.c:612
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtr�r efter afsender"
 
-#: mail/folder-browser.c:615
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r efter modtager"
 
-#: mail/folder-browser.c:618
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r efter diskussionsliste"
 
-#: mail/folder-browser.c:627
-msgid "_Open"
-msgstr "_�bn"
-
-#: mail/folder-browser.c:629
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Gensend"
 
-#: mail/folder-browser.c:631 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Gem som..."
 
-#: mail/folder-browser.c:633 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:117
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Svar til afsende_r"
 
-#: mail/folder-browser.c:640 ui/evolution-mail.xml.h:72
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Svar til _alle"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:642
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "M�r_k som l�st"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "M�rk som u_l�st"
 
-#: mail/folder-browser.c:652
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Vigtig"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Mark�r som ul�st"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Flyt til mappe..."
 
-#: mail/folder-browser.c:654
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kopi�r til mappe..."
 
-#: mail/folder-browser.c:658 ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Fortryd sletning"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Tilf�j adressebog"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Skab rege_l fra besked"
 
-#: mail/folder-browser.c:811
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtr�r efter epostliste"
 
-#: mail/folder-browser.c:812
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "vMappe efter diskussionsliste"
 
-#: mail/folder-browser.c:814
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr�r efter diskussionsliste (%s)"
 
-#: mail/folder-browser.c:815
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMappe efter diskussionsliste (%s)"
 
-#: mail/folder-browser-factory.c:196
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Egenskaber for \"%s\""
-
-#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaber"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponent til h�ndtering af post."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution beskedskriver."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabrik for Evolution beskedskriver."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabrik for Evolution postkomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-#, fuzzy
-msgid "Mail configuration interface"
-msgstr "Konfiguration af epost"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6080,37 +6709,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution kontoredigering"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoredigering"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Signaturfil:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Denne meddelelse er ikke sendt.\n"
+"\n"
+"Vil du gemme �ndringene?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (standard)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Deaktiv�r"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Aktiv�r"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil slette denne konto?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Fortryd sletning"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "G�r dette til min standardkonto"
+
+#: 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 nyhedskonto?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:568
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution kontobehandler"
 
@@ -6178,37 +6839,45 @@ msgstr ""
 "Denne meddelse har intet emne.\n"
 "Skal den sendes alligevel?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Du skal specificere modtagere for at kunne sende denne besked."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Du skal konfigurere en konto f�r du kan sende dette brev."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Den %s skrev %s:"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Videresendt meddelelse:\n"
 
-#: mail/mail-callbacks.c:849
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:851
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopi�r meddelelse(r) til"
 
-#: mail/mail-callbacks.c:1130
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: mail/mail-callbacks.c:1152
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6216,7 +6885,7 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: mail/mail-callbacks.c:1186
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6224,37 +6893,25 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1442
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: mail/mail-callbacks.c:1219
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Beskeden blev modtaget"
 
-#: mail/mail-callbacks.c:1253 mail/mail-display.c:92
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-callbacks.c:1257 mail/mail-display.c:96
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: mail/mail-callbacks.c:1301
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1303
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:1462
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6263,23 +6920,23 @@ msgstr ""
 "Fejl ved indl�sning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1520
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtre"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:1567
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: mail/mail-callbacks.c:1662
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil slette denne nyhedskonto?"
 
-#: mail/mail-config.c:1199 mail/mail-config.c:1202
-msgid "Connecting to server..."
-msgstr "Opkobler til server..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6320,10 +6977,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution konto-guide"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Opkobler til server..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Tjek for st�ttede typer"
@@ -6333,42 +6994,63 @@ msgid " color"
 msgstr " farve"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "kontoinformation"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Kontoadministration"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Konti"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Indl�s aftid billeder fra nettet"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Bilag"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Godkendelsestype: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Tjek automatisk for nye beskeder hvert"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Beskedskriver"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6380,349 +7062,530 @@ msgstr ""
 "Din epost-konfiguration er nu komplet.\n"
 "Klik \"Fuldf�r\" for at gemme dine nye indstillinger"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:22
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "F�rdig"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Kladder"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Kladdemappe:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Redig�r..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Epostadresse:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Aktiv�r"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Fulde navn:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Konfiguration af epost"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Postkasseformat"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "G�r dette til min standardkonto"
 
-#: mail/mail-config.glade.h:42
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "Udskriv den valgte meddelelse"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Tjenertype:"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nyheder"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:49
-msgid "PGP"
-msgstr "PGP"
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP bin�rsti:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "V�lg en farve"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Legger til en melding uten emne"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Kan ikke sende besked: ingen modtagere defineret."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "Bem�rkning"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Secure MIME"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Sikkerhed"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "V�lg PGP bin�r"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Konfiguration af tjener"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server kr�ver autentificering"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Kilder"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Ingen information"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Specielle mapper"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:78
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Brug sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:33
-msgid "_Edit"
-msgstr "_Redig�r"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "newswindow1"
+msgstr "nu"
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "sekunder."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Kunne ikke indl�se sammendrag for %s"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "Kunne ikke indl�se sammendrag for %s"
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Kunne ikke koble til POP-tjener p� %s."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
 
-#: mail/mail-display.c:196
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:236
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke oprette midlertidig katalog: %s"
-
-#: mail/mail-display.c:297
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Gem p� disk..."
 
-#: mail/mail-display.c:299
-#, c-format
-msgid "Open in %s..."
-msgstr "�bn i %s..."
-
-#: mail/mail-display.c:301
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-display.c:336
-msgid "External Viewer"
-msgstr "Ekstern visning"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "�bn i %s..."
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis i brev (via %s)"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:962
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Ekstern visning"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Indl�ser indholdet af beskeden"
 
-#: mail/mail-display.c:1253
-msgid "Open link in browser"
-msgstr ""
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "_�pne i nytt vindu"
+
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopi�r placering (RETMIG)"
 
-#: mail/mail-display.c:1255
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Gem som (RETMIG)"
 
-#: mail/mail-display.c:1257
-msgid "Copy location (FIXME)"
-msgstr "Kopi�r placering (RETMIG)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gem som..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d sekunder"
 
-#: mail/mail-format.c:527
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:573
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:1029
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Dato"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Epostadresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Afsender"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Svar-til:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Modtager"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Kopi:"
+
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1044
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
 
-#: mail/mail-format.c:1050
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Krypteret besked"
 
-#: mail/mail-format.c:1051
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Klik p� ikonen for at dekryptere."
 
-#: mail/mail-format.c:1141 mail/mail-format.c:1527
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne besked er underskrevet digitalt og er fundet autentisk."
 
-#: mail/mail-format.c:1149 mail/mail-format.c:1535
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne besked er underskrevet digitalt, men er ikke fundet autentisk."
 
-#: mail/mail-format.c:1749
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig p� netsted \"%s\""
 
-#: mail/mail-format.c:1765
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peger til FTP-tjener (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:1804
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:505
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "�bner '%s'"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:789
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "�ndr mappe \"%s\" til \"%s\" format"
-
-#: mail/mail-local.c:812
-msgid "Reconfiguring folder"
-msgstr "_Rekonfigur�r mappe"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:841
-msgid "Closing current folder"
-msgstr "Lukker aktiv mappe"
-
-#: mail/mail-local.c:873
-msgid "Renaming old folder and opening"
-msgstr "�ndrer navn p� gammel mappe og gen�bner"
-
-#: mail/mail-local.c:891
-msgid "Creating new folder"
-msgstr "Opretter en ny mappe"
-
-#: mail/mail-local.c:905
-msgid "Copying messages"
-msgstr "Kopierer beskeder"
-
-#: mail/mail-local.c:922
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6731,7 +7594,7 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s"
 
-#: mail/mail-local.c:961
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6739,7 +7602,19 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen skal\n"
 "du reparere den manuelt."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+"Du kan kun redigere beskeder lagret\n"
+"i Skitse-kataloget."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Konfigur�r %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6748,7 +7623,7 @@ msgstr ""
 "Fejl ved '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6757,101 +7632,105 @@ msgstr ""
 "Fejl ved udf�ring af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution fremgang"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender '%s'"
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Sender meddelelse"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Fuldf�rt."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gemmer besked i mappe"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter meddelelser til %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopi�rer"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Papirkurv"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "�bner lager %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "�bner mappe %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "_Rekonfigur�r mappe"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "T�mmer mappe for slettede beskeder"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Modtager meddelelse %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Modtager meddelelser"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Henter besked nummer %d af %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Gemmer beskeder"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6860,12 +7739,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gemmer besked %d af %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6874,11 +7748,11 @@ msgstr ""
 "Fejl ved gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6887,12 +7761,12 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2101
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Epost fra %s"
@@ -6901,250 +7775,176 @@ msgstr "Epost fra %s"
 msgid "(Untitled Message)"
 msgstr "(Unavngivet besked)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Unavngivet besked)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Kopierer beskeder"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Find i besked"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 #, fuzzy
 msgid "Search Forward"
 msgstr "S�g efter en streng"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Find:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Matcher:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_S�g"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Modtager"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Sender"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Afbrudt"
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Ufuldst�ndig meddelse skrevet til r�r!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Sammendrag"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "Handling annulleret"
 
-#: mail/mail-tools.c:145
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke oprette midlertidig mbox '%s': %s"
 
-#: mail/mail-tools.c:192
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (videresendt meddelelse)"
-
-#: mail/mail-tools.c:202
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (uden emne)"
-
-#: mail/mail-tools.c:219
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt meddelelse - %s"
 
-#: mail/mail-tools.c:221
-msgid "Forwarded message (no subject)"
-msgstr "Videresendt meddelelse (intet emne)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Videresendte meddelelser"
 
-#: mail/mail-tools.c:428
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Videresendt besked---<br><b>Fra:</b> %s<br><b>Til:</b> "
-"%s<br><b>Emne:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Videresendte meddelelser"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
-msgid "Reply"
-msgstr "Svar"
-
-#: mail/message-browser.c:188
-msgid "Reply to the sender of this message"
-msgstr "Svar til afsenderen af denne meddelelse"
-
-#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#: mail/message-browser.c:191
-msgid "Reply to all recipients of this message"
-msgstr "Svar til alle modtagere af denne meddelelse"
-
-#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
-msgid "Forward"
-msgstr "Videresend"
-
-#: mail/message-browser.c:194
-msgid "Forward this message"
-msgstr "Videresend denne meddelelse"
-
-#: mail/message-browser.c:199
-msgid "Print the selected message"
-msgstr "Udskriv den valgte meddelelse"
-
-#: mail/message-browser.c:202
-msgid "Delete this message"
-msgstr "Slet denne meddelelse"
-
-#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Forri_ge"
-
-#: mail/message-browser.c:207
-msgid "Previous message"
-msgstr "Forrige besked"
-
-#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "N�ste"
-
-#: mail/message-browser.c:210
-msgid "Next message"
-msgstr "Hj�lpebesked"
-
-#: mail/message-list.c:677
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Ul�st"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "L�st"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Flere ul�ste beskeder"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "H�jere"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "H�jest"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Idag %h:%M"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ig�r %h:%M"
 
-#: mail/message-list.c:969
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:977
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1081
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Tr�det meddelelsesliste"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "M�rket"
 
-#: mail/message-list.c:1082
-msgid "From"
-msgstr "Afsender"
-
-#: mail/message-list.c:1082
-msgid "Date"
-msgstr "Dato"
-
-#: mail/message-list.c:1082
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Modtaget"
 
-#: mail/message-list.c:1083
-msgid "To"
-msgstr "Modtager"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "St�rrelse"
 
-#: mail/mail-session.c:161
-#, fuzzy
-msgid "User canceled operation."
-msgstr "Handling annulleret"
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
 
@@ -7172,15 +7972,1464 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "_H�ndt�r abonnementer"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Aftaler"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Vis aftaler"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%H:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %H:%M"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sammendrag"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Tilf�j tjeneste"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution installation"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Fejl ved indl�sning af kalender</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Vis opgaver"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sektioner:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A den %e. %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Udskrivning af besked mislykkedes"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "T�m"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "Vis i brev"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Deaktiv�r"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "for"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Notater:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Inds�t"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Kilder"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "for"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Lavest"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Lavest"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Vis"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Moderate rain"
+msgstr "Tilf�j kriterie"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Heavy rain"
+msgstr "Dagomr�de"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Beskrivelse indeholder"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Find igen"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "nu"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Opdat�r nu"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Beskrivelse indeholder"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+#, fuzzy
+msgid "Few ice crystals"
+msgstr "F�rre kriterier"
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Epost"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#, fuzzy
+msgid "Light hail"
+msgstr "H�jde:"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Vis alt"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Prim�r epost"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Modtager post"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Vis alt"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Vis alt "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Autenticering kr�ves"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Ukendt fejl"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Invitationer til m�de"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Fr�ken"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portr�t"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Diskussionsliste"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Vis alt"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Luk dette vindue"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Point"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Vis opgaver"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Luk dette vindue"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Afsend"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Toptekst"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Light haze"
+msgstr "H�jde:"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dage"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "august"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Opgaver der skal fuldf�res"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Opgaver der skal fuldf�res"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Tilf�j tjeneste"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Mapper"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Alle deltagere"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Vis mapper som som starter med:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Vis valgmuligheder"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Vis"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "fredag"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Indstillinger"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "%s-tjener %s"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "onsdag"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "m�ned"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 uge"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Afs�t\n"
+"tid"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Vis opgaver"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Vis fulde brev_hoveder"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Vis opgaver"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Opgaver"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"Enhed:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Andet"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Sjekk innstillinger"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "april"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution-skallen."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detaljer"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Annull�r m�de"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Specielle mapper"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution installation"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7188,29 +9437,25 @@ msgstr ""
 "Denne nye version af Evolution skal installere flere filer i\n"
 "dit personlige Evolution-katalog"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik venligst \"Ok\" for at installere filerne, eller 'annull�r' for at "
 "afslutte."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Kunne ikke opdatere filer korrekt"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Evolutions filer blev installeret."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dette ser ud til at v�re f�rste gang du k�rer Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Venligst klik \"OK\" for at installere Evolutions brugerfiler under"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7221,16 +9466,14 @@ msgstr ""
 "%s\n"
 "Fejl: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Kan ikke kopiere filer til\n"
-"'%s'."
+msgstr "En fejl skete ved l�sning af filen."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7241,7 +9484,16 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7252,21 +9504,58 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Kan ikke f� fat p� mappe: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Kan ikke kopiere filer til\n"
+"'%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke ops�tte lokal gemning -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Kopi�r til mappe"
 
-#: shell/e-shell.c:1268
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Ups! Visningen for `%s' d�de uventet. :-(\n"
-"Dette betyder sandsynligvis at %s komponenten er brudt ned."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Flyt til folder"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "V�lg mappe"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "�bner mappe %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7275,15 +9564,15 @@ msgstr ""
 "Kan ikke oprette specificeret katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Det angivne katalognavn er ikke gyldigt."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - opret ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7291,11 +9580,11 @@ msgstr ""
 "Typen p� den valgte mappe er ikke gyldig til\n"
 "den �nskede operation."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Unavngivet)"
 
@@ -7335,7 +9624,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring %d."
 
-#: shell/e-shell-importer.c:353
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -7344,11 +9633,11 @@ msgstr ""
 "Der er ingen import�r som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:371
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -7357,17 +9646,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:384
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:404
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indl�sning af %s"
 
-#: shell/e-shell-importer.c:419
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -7376,57 +9665,47 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring 1."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "V�lg fil"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:601
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "V�lg mappe"
 
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
 #: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "Afbryder forbindelser..."
 
-#: shell/e-shell-view.c:149
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:1204
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1206
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view-menu.c:175
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Fejl-Frede fandtes ikke i din $PATH"
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Fejl-Frede kunne ikke k�res"
 
-#: shell/e-shell-view-menu.c:226
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Ophavsret tilh�rende Ximian, Inc. 1999-2001."
 
-#: shell/e-shell-view-menu.c:228
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7436,31 +9715,88 @@ msgstr ""
 "til administrering af post, kalender og aftaler\n"
 "indenfor Gnomes skrivebordsmilj�."
 
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view-menu.c:576
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Opret en ny genvejsgruppe"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Arbejd p� nettet"
 
-#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
-msgid "Work offline"
-msgstr "Arbejd uden net"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Fejl under gemning af genveje."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Ingen mappe vist)"
 
-#: shell/e-shortcuts-view.c:134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke ops�tte lokal gemning -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ups! Visningen for `%s' d�de uventet. :-(\n"
+"Dette betyder sandsynligvis at %s komponenten er brudt ned."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Opret en ny kontakt"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7469,110 +9805,204 @@ msgstr ""
 "�nsker du virkelig at fjerne gruppe %s\n"
 "fra genvejsbj�lken?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Fjern ikke"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Sm� ikoner"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som sm� ikoner"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Fjern denne gruppe..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Fjern denne gruppe..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Skjul genvejsbj�lken"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejsbj�lken"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Aktiv�r"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�bn"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "_�pne i nytt vindu"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Aktiv�r denne genvej"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Udskriv den valgte meddelelse"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Regelnavn: "
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejsbj�lken"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Fejl under gemning af genveje."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Genvejsbj�lke"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontakt"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Uden navn)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Almindelig fejl"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Angivet mappe blev ikke fundet"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funktionen ikke implementeret i denne gemning"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Adgang n�gtet"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operationen er ikke underst�ttet"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivne type er ikke underst�ttet i denne gemning"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% f�rdi_g:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Afbryder forbindelser..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "V�rt:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -7585,10 +10015,6 @@ msgstr "Mappetype:"
 msgid "Specify where to create the folder:"
 msgstr "Angiv hvor mappen skal oprettes:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution-skallen."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Import�r\" for at starte importering af filen til Evolution."
@@ -7611,26 +10037,35 @@ msgstr ""
 "Via denne vejviser vil du ledes gennem importprocessen af\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:186
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importerer"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Fjern ikke"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7655,7 +10090,7 @@ msgstr ""
 "Vi h�ber at du nyder resultatene af vort h�rde arbejde, og vi venter i\n"
 "sp�nding p� at du tilbyder din hj�lp!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7663,236 +10098,323 @@ msgstr ""
 "Tak\n"
 "Holdet bag Evolution\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Kan ikke initialisere Evolution-skallen."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Deaktiv�r opstartssk�rm"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere komponentsystemet, Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopi�r"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Kopi�r valget"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Opret ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slet kontakt"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Opret ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Find"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klip ud"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Find kontakt"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Klip valget ud"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Slet kontakt"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nyheder"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Inds�t"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Inds�t fra klippebordet"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Udskriv kontakt"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "V�lg alle"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Slet kontakt"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Stop indl�sning"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Vis alle"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Adressebog-kilder..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Kontakt"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Udskriv..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_S�g efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:46
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "V�lg alle"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_V�rkt�j"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "Fem dage"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "�ndr ops�tning"
+#: ui/evolution-calendar.xml.h:2
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Klik her for adressebogen"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Opret en ny aftale for hele dagen"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Opret en ny aftale"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Opret en ny kalender"
+msgid "Create a new appointment"
+msgstr "Opret en ny aftale"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "G� til"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "G� tilbage i tiden"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "G� fremad i tid"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "G� til _dato"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "G� _til idag"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "G� til specifik dato"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "G� til nutiden"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "M�ned"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Ny aftal_e"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "�bn kalender"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Smugkig"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Ny aftale"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Udskriv kalender"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gem som"
+#: ui/evolution-calendar.xml.h:22
+msgid "Publish Free/Busy Information"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Gem kalender som noget andet"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Vis �n dag"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Vis �n m�ned"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Vis �n uge"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "I dag"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Arbejds_uge"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Uge"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Aftale"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Indstillinger for _post..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Dag"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_M�ned"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:42
-msgid "_New"
-msgstr "_Ny"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_�bn kalender"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Uge"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Luk"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Luk denne aftale"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Slet denne aftale"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Den centrale v�rkt�jslinje"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Vis udskrift"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Skriverops�tning"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Udskriv denne ting"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Udskriv..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Gem og luk"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Gem aftalen og luk dialogboksen"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "�ndr visningen til %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Redig�r sideindstillinger for aktiv skriver"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "Ha_ndlinger"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fil"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Slet dette punkt"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Slet..."
 
@@ -7904,27 +10426,12 @@ msgstr "Hj�lp"
 msgid "Print En_velope..."
 msgstr "Skriv kuvert..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Udskriv denne ting"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Udskriv..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Gem som..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Gem og luk"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Gem kontakten og luk dialogboksen"
@@ -7941,1028 +10448,1007 @@ msgstr "Se hj�lpetekster"
 msgid "Send _message to contact..."
 msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:34
-msgid "_File"
-msgstr "_Fil"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikation"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Om..."
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Slet dette punkt"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Gem opgaven og luk dialogboksen"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Adresse_bog..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Send _kontaktperson til andre..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "T_�m"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Klip _ud"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Annull�r m�de"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "_Tjek navne"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "T�m"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Videresend som v_Kalender (RET)"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "T�m det valgte"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Videresend denne meddelelse"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Luk denne aftale"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kopi�r til mappe... (RETMIG)"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Anmod\n"
+"om m�de"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopi�r"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Planl�g m�de"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopi�r valget"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Planl�g m�de"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Klip ud"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "Ha_ndlinger"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Klip valget ud"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Slet denne aftale"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Annull�r"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Gem aktiv fil"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse af gr�nsefladen som XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Skriv"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "F�_rste opf�ring i mappe (RET)"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Udskriv ny meddelelse"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Videresend (RET)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Videresend som v_Kalender (RET)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "G� til n�ste opf�ring"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "G� til forrige opf�ring"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "_T�m papirkurven"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "U_komplet opgave (RETMIG)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Glem _adgangskoder"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "�ndr filens egenskaber"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "N_�ste"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "_H�ndt�r abonnement..."
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Inds�t"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Inds�t fra klippebordet"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Forri_ge"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Send / modtag"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Vis udskrift"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Afsend k�et post og modtag ny post"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Skriverops_�tning..."
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Skriverops�tning"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Gem"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "R_edigering af virtuelle mapper..."
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Gem aftalen og luk dialogboksen"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtre..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Gem aktiv fil"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Postmeddelelse"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Planl�g m�de"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Indstillinger for _post..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Ops�t et eller andet m�de"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Smugkig"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "V�lg alle"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Send / modtag"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "V�lg alt"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Redig�r sideindstillinger for aktiv skriver"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_Opgaveforesp�rgsel"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Om..."
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:31
-msgid "_Close"
-msgstr "L_uk"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Skjul slettede beskeder"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:32
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (RETMIG)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Skjul _l�ste beskeder"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopi�r"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Fejls�g"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "M�rk alle som l_�st"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "_Hj�lp"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Opf�ring (RETMIG)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Inds�t fra klippebordet"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Journalopf�ring (RETMIG)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Sidste opf�ring i mappen (RETMIG)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "V�lg _alle"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Postmeddelelse (RETMIG)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "V�lg _tr�d"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Flyt til mappe... (RETMIG)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note (RETMIG)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Inds�t"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Egenska_ber..."
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Vis _alt"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "V�lg alle"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:45
-msgid "_Task (FIXME)"
-msgstr "Opgave (RETMIG)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Ul�st opf�ring (RETMIG)"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:52
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:47
-msgid "_View"
-msgstr "_Vis"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Tr�det meddelelsesliste"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Tilf�j tjeneste"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_T�m"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Tilf�j ny tjeneste til ledelsesresum�"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Mappe"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Opret et nyt brev"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Indstillinger for Ledelsesresum�..."
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "Egenska_ber..."
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nyt post"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Tr�det meddelelsesliste"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "Annull�r"
-
-#: ui/evolution-mail.xml.h:3
-#, fuzzy
-msgid "Cancel the current mail operation"
-msgstr "Gem aktiv fil"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Skriv"
-
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Svar til alle modtagere af denne meddelelse"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Svar til afsenderen af denne meddelelse"
+
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Svar til afsenderen af denne meddelelse"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Kopi�r meddelelse til en ny mappe"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Videresendt meddelelse (intet emne)"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
-msgid "Display the next message"
+msgid "Display the next unread thread"
 msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Les en tidligere lagret melding"
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Les en tidligere lagret melding"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Empty _Trash"
-msgstr "_T�m papirkurven"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Les en tidligere lagret melding"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtr�r efter epost_liste"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtr�r efter se_nder"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtr�r p� modtage_re"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtr�r p� e_mne"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
-msgid "Forget _Passwords"
-msgstr "Glem _adgangskoder"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Videresend"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Videresend som"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "Vis bilag"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "Videresend mellem linjerne"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Videresend som"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgte beskeder"
-
-#: ui/evolution-mail.xml.h:43
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slettede beskeder"
-
-#: ui/evolution-mail.xml.h:44
-msgid "Hide _Read messages"
-msgstr "Skjul _l�ste beskeder"
-
-#: ui/evolution-mail.xml.h:45
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Load _Images"
 msgstr "Videresendte meddelelser"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Manage _Subscriptions..."
-msgstr "_H�ndt�r abonnement..."
-
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mar_k As Read"
-msgstr "M�r_k som l�st"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Mark All as R_ead"
-msgstr "M�rk alle som l_�st"
+msgid "Mark as I_mportant"
+msgstr "Vigtig"
 
-#: ui/evolution-mail.xml.h:50
-msgid "Mark As U_nread"
-msgstr "M�rk som _ul�st"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Mark�r som ul�st"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
-msgid "Mark all visible messages as read"
+msgid "Mark the selected messages as having been read"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected messages as important"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Open a window for composing a mail message"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "N�ste"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Hj�lpebesked"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Hj�lpebesked"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "V�lg _tr�d"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Hj�lpebesked"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Viser forh�ndsvisning af beskeden som skal udskrives"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Forri_ge"
+
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Flyt meddelelsen til en ny mappe"
+msgid "Previous Important Message"
+msgstr "Forrige besked"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Flyt meddelelsen til en ny mappe"
+msgid "Previous Message"
+msgstr "Forrige besked"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Forrige besked"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Message..."
 msgstr "Udskriv besked..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Print Preview..."
 msgstr "Forh�ndsvisning af udskrift"
 
-#: ui/evolution-mail.xml.h:68
-msgid "Print message to the printer"
-msgstr "Udskriv besked til printeren"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Udskriv besked"
+
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Svar"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Redirect (FIXME: implement me)"
-msgstr "Omdirig�r"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Svar til alle"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "S_earch Message"
 msgstr "_Postmeddelelse"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "V�lg _alle"
-
-#: ui/evolution-mail.xml.h:77
-msgid "Select _Thread"
-msgstr "V�lg _tr�d"
-
-#: ui/evolution-mail.xml.h:78
-msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:79
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:80
-#, fuzzy
-msgid "Select all visible messages"
-msgstr "Udskriv den valgte meddelelse"
-
-#: ui/evolution-mail.xml.h:81
-msgid "Send / Receive"
-msgstr "Send / modtag"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Afsend k�et post og modtag ny post"
-
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Kilder"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Vis fulde brev_hoveder"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Show _All"
-msgstr "Vis _alt"
-
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Ingen besked med uid %s"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Show messages that have been temporarily hidden"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Vedh�ft bilag til meddelelsen"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:91
-#, fuzzy
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Udskriv den valgte meddelelse"
-
-#: ui/evolution-mail.xml.h:92
-#, fuzzy
-msgid "Temporarily hide the selected messages"
-msgstr "Udskriv den valgte meddelelse"
-
-#: ui/evolution-mail.xml.h:93
-msgid "Threaded Message list"
-msgstr "Tr�det meddelelsesliste"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "vMappe efter epostliste..."
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "vMappe for _afsender..."
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "vMappe for _modtagere..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "vMappe p� e_mne..."
 
-#: ui/evolution-mail.xml.h:99
-msgid "Virtual Folder _Editor..."
-msgstr "R_edigering af virtuelle mapper..."
-
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Anvend filtre"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopi�r til mappe"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Expunge"
-msgstr "_T�m"
-
-#: ui/evolution-mail.xml.h:105
-msgid "_Filters..."
-msgstr "_Filtre..."
-
-#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:35
-msgid "_Folder"
-msgstr "_Mappe"
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Videresendte meddelelser"
 
-#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:109
-msgid "_Mail Message"
-msgstr "_Postmeddelelse"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Mail Settings..."
-msgstr "Indstillinger for _post..."
-
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Beskeder"
 
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flyt til folder"
 
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send beskeder _igen"
 
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Re-send Message"
 msgstr "Send beskeder _igen"
 
-#: ui/evolution-mail.xml.h:119
-msgid "_Send / Receive"
-msgstr "_Send / modtag"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Luk dette vindue"
 
-#: ui/evolution-mail.xml.h:120
-#, fuzzy
-msgid "_Threaded Message List"
-msgstr "Tr�det meddelelsesliste"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personligg�r"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "�ndr v�rkt�jslinjerne"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "L_uk"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vis"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedl�g"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Luk aktiv fil"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Signaturfil:"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Krypt�r denne besked med PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inds�t tekstfil..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Vedh�ft bilag til meddelelsen"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inds�t tekstfil..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "�bn fil"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP-krypt�r"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP-sign�r"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gem _udkast"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP-krypt�r"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "_Gem i mappe... (RET)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Gem"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gem som"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Gem _udkast"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Gem aktiv fil"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Gem aktiv fil med et andet navn"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Afsend"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Afsend _senere"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Afsend _senere"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Send brevet i HMTL-format"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Send beskeden senere"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Send beskeden nu"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Send denne meddelelse nu"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Vis/skjul bilag"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Vis _bilag"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Vis bilag"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Bilag"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_B-kopifelt"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Kopifelt"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Fejls�g"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Slet"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_inds�t"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inds�t tekstfil... (RETMIG)"
-
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_�bn..."
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Svar-til-felt"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Sikkerhed"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Hj�lp"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Mappe"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Opdat�r liste"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Opdat�r mappelisten"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Abonn�r"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Opsig abonnement"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "_Tildel opgave (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Find igen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Gentag"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Gentag sidste fortrudte handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Erstat"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Erstat en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Svar til _alle (RETMIG)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "S_end statusrapport (RETMIG)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Gem opgaven og luk dialogboksen"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "S�g efter en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Fortryd"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Annull�r"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr ""
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Slet opgaven"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:30
-msgid "_Appointment (FIXME)"
-msgstr "_Aftale (RETMIG)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Opdat�r liste"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Mark�r som fuldf�rt (RETMIG)"
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Klik her for adressebogen"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Sva_r (RETMIG)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_�bn valgte beskeder"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Slet opgaven"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Slet opgaven"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Inds�t fra klippebordet"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Gem opgave som noget andet"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Ops�tning af opgaver"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Indstillinger for _post..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Opgave"
 
@@ -8970,151 +11456,219 @@ msgstr "_Opgave"
 msgid "About Evolution..."
 msgstr "Om evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Genvejsbj�lke"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personligg�r"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "�ndr visningen til %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "�ndr v�rkt�jslinjerne"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Kopi�r til mappe"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Opretter en ny mappe"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Fjern denne genvej fra genvejsbj�lken"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Opretter en ny mappe"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Slet dette punkt"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Afslut"
 
 # OSS = Ofte Stillede Sp�rgsm�l
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution OSS"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _vindue"
 
-#: ui/evolution.xml.h:11
-msgid "Evolution bar _shortcut"
-msgstr ""
-
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Afslut program"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Kom i gang"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:15
-msgid "Main toolbar"
-msgstr "Den centrale v�rkt�jslinje"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "_�pne i nytt vindu"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Vis information om Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Toggle"
 msgstr "Rolle"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Brug af kalenderen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Brug af postdelen"
 
-#: ui/evolution.xml.h:27
-msgid "Work Offline"
-msgstr ""
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Om Evolution"
 
-#: ui/evolution.xml.h:29
-msgid "_Actions"
-msgstr "Ha_ndlinger"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Aftale (RETMIG)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt (RETMIG)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopi�r"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Import�r fil..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Send besked"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "_Gem som..."
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Ny"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Ny Mappe"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_�bn..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Genvejsbj�lke"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Genvejsbj�lke"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Opgave (RETMIG)"
+
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Arbejder"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Indstillinger for _post..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Adressekort"
 
 #: views/addressbook/galview.xml.h:2
@@ -9146,9 +11700,12 @@ msgstr "Beskeder"
 msgid "With Category"
 msgstr "Med kategori"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A den %e. %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9222,70 +11779,138 @@ msgstr "S_lut-tid for m�de:"
 msgid "All Attendees"
 msgstr "Alle deltagere"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A den %e. %B %Y"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Nuv�rende visning"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%a %d %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "I dag"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "O.k."
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen skal skrives ind p� formatet: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+#, fuzzy
+msgid "Chinese"
+msgstr "Foresatte"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "uge"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Papirkurv"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Alternativer"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Nyheder"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Ukendt fejl: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Andet"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Kontaktredigering"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Gem s�gning"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Avanceret s�gning"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Gem som..."
-
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alt"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Redig�r..."
-
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanceret..."
 
@@ -9297,6 +11922,10 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Advarsel"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Fejl"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Sp�rgsm�l"
@@ -9334,6 +11963,520 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "�ndr ops�tning"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Ops�tning af opgaver"
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontakter..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Firma:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Som _minikort"
+
+#~ msgid "As _Table"
+#~ msgstr "Som _tabel"
+
+#~ msgid "Find..."
+#~ msgstr "Find..."
+
+#~ msgid "Open calendar"
+#~ msgstr "�bn kalender"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gem kalender"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Fejl ved indl�sning af kalender:<br>Metode ikke underst�ttet"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmer afbrydes efter"
+
+#~ msgid "Colors"
+#~ msgstr "Farver"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Sl� uds�ttelse til for"
+
+#~ msgid "Highlight"
+#~ msgstr "Fremh�v:"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Punkter som skal afsluttes idag:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Punkter som ikke skal afsluttes endnu"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Punkter som ikke skal afsluttes endnu:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Overskredne opgaver:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Opgaveblok"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tid til afslutning"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle alarmer"
+
+#~ msgid "Work week"
+#~ msgstr "Arbejdsuge"
+
+#~ msgid "Edit Task"
+#~ msgstr "Redig�r opgave"
+
+#~ msgid "Percent complete"
+#~ msgstr "Procent f�rdig"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Mark�r opgaven som fuldf�rt"
+
+#~ msgid "Edit this task..."
+#~ msgstr "�ndr denne opgave..."
+
+#~ msgid "Edit the task"
+#~ msgstr "�ndr denne opgave"
+
+#~ msgid "Go to Today"
+#~ msgstr "G� til i dag"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "Planl�g m�de"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dette er et svar fra nogen som ikke er inviteret!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kunne ikke opdatere dit kalenderlager."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Kunne ikke slette kalenderkomponenten!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Sletning af komponent fuldf�rt."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Kan ikke genkende denne type kalenderkomponent."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Tilf�j til Kalender"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Opdat�r kalender"
+
+#~ msgid "Attendee address"
+#~ msgstr "Deltagers adresse"
+
+#~ msgid "Attendees: "
+#~ msgstr "Deltagere:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Annull�r\n"
+#~ "m�de"
+
+#~ msgid "Organizer: "
+#~ msgstr "Arrang�r:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Offentligg�r\n"
+#~ "arrangement"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Vis dialog"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Grundl�ggende om aftaler"
+
+#~ msgid "Settings..."
+#~ msgstr "Indstillinger..."
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Start dato:"
+
+#~ msgid "Summary contains"
+#~ msgstr "Sammendrag indeholder"
+
+#, fuzzy
+#~ msgid "Comment contains"
+#~ msgstr "Navn indeholder"
+
+#~ msgid "Has category"
+#~ msgstr "Har kategori"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Kunne ikke tjekke l�sefil for %s: %s"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Fejl under gemning af genveje."
+
+#~ msgid "Invalid password."
+#~ msgstr "Ugyldig adgangskode."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikke oprette l�sefil for %s: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Kunne ikke koble til tjener: %s."
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Kunne ikke oprette r�r: %s"
+
+#, fuzzy
+#~ msgid "Could not sign: failed to create content info."
+#~ msgstr "Kan ikke oprette komponeringsvinduet."
+
+#, fuzzy
+#~ msgid "'clearsign' is not supported by S/MIME."
+#~ msgstr "Den angivne type er ikke underst�ttet i denne gemning"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Skanner IMAP-mapper"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke �bne signaturfilen %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Dette er ikke en almindelig fil."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Den fil s� ud til at v�re tilg�ngelig, men open(2) fejlede."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Filen er meget stor (mere end 100 k).\n"
+#~ "Er du sikker p� at du �nsker at inds�tte den?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr " "
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr " "
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke �bne HTML-fil:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "V�lg tjeneste"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Send et brev til %s"
+
+#~ msgid "Run %s"
+#~ msgstr "K�r %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Luk %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Flyt %s til venstre"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Flyt %s til h�jre"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammendrag"
+
+#~ msgid "Test service"
+#~ msgstr "Testtjeneste"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Videresend til adresse"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adresseb�ger"
+
+#~ msgid "PGP"
+#~ msgstr "PGP"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "�ndr mappe \"%s\" til \"%s\" format"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Lukker aktiv mappe"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "�ndrer navn p� gammel mappe og gen�bner"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Opretter en ny mappe"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopierer beskeder"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution fremgang"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Henter besked nummer %d af %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gemmer besked %d af %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Ufuldst�ndig meddelse skrevet til r�r!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (videresendt meddelelse)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (uden emne)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Videresendt meddelelse (intet emne)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Videresendt besked---<br><b>Fra:</b> %s<br><b>Til:</b> "
+#~ "%s<br><b>Emne:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "Svar til afsenderen af denne meddelelse"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "Svar til alle modtagere af denne meddelelse"
+
+#~ msgid "Delete this message"
+#~ msgstr "Slet denne meddelelse"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolutions filer blev installeret."
+
+#~ msgid "Activate"
+#~ msgstr "Aktiv�r"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Aktiv�r denne genvej"
+
+#~ msgid "Find"
+#~ msgstr "Find"
+
+#~ msgid "Find a contact"
+#~ msgstr "Find kontakt"
+
+#~ msgid "View All"
+#~ msgstr "Vis alle"
+
+#~ msgid "View all contacts"
+#~ msgstr "Vis alle kontakter"
+
+#~ msgid "5 Days"
+#~ msgstr "Fem dage"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Opret en ny kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Open Calendar"
+#~ msgstr "�bn kalender"
+
+#~ msgid "Prev"
+#~ msgstr "Smugkig"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gem kalender som noget andet"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_�bn kalender"
+
+#~ msgid "About this application"
+#~ msgstr "Om denne applikation"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Ha_ndlinger"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Adresse_bog..."
+
+#~ msgid "C_lear"
+#~ msgstr "T_�m"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Tjek navne"
+
+#~ msgid "Clear the selection"
+#~ msgstr "T�m det valgte"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Kopi�r til mappe... (RETMIG)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Dump beskrivelse af gr�nsefladen som XML"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "F�_rste opf�ring i mappe (RET)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Videresend (RET)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "G� til n�ste opf�ring"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "G� til forrige opf�ring"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "U_komplet opgave (RETMIG)"
+
+#~ msgid "N_ext"
+#~ msgstr "N_�ste"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Forri_ge"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Skriverops_�tning..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Ops�t et eller andet m�de"
+
+#~ msgid "Select everything"
+#~ msgstr "V�lg alt"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_Opgaveforesp�rgsel"
+
+#~ msgid "_About..."
+#~ msgstr "_Om..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "Opf�ring (RETMIG)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Journalopf�ring (RETMIG)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Sidste opf�ring i mappen (RETMIG)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Postmeddelelse (RETMIG)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Flyt til mappe... (RETMIG)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Note (RETMIG)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Ul�st opf�ring (RETMIG)"
+
+#~ msgid "Add Service"
+#~ msgstr "Tilf�j tjeneste"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Tilf�j ny tjeneste til ledelsesresum�"
+
+#~ msgid "Create a new email"
+#~ msgstr "Opret et nyt brev"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Indstillinger for Ledelsesresum�..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nyt post"
+
+#, fuzzy
+#~ msgid "Mar_k As Read"
+#~ msgstr "M�r_k som l�st"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "M�rk som _ul�st"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Udskriv besked til printeren"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Omdirig�r"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "_Gem i mappe... (RET)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Send beskeden nu"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inds�t tekstfil... (RETMIG)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_Tildel opgave (RET)"
+
+#~ msgid "Redo"
+#~ msgstr "Gentag"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Gentag sidste fortrudte handling"
+
+#~ msgid "Replace"
+#~ msgstr "Erstat"
+
+#~ msgid "Replace a string"
+#~ msgstr "Erstat en streng"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Svar til _alle (RETMIG)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "S_end statusrapport (RETMIG)"
+
+#~ msgid "Search for a string"
+#~ msgstr "S�g efter en streng"
+
+#~ msgid "Undo"
+#~ msgstr "Fortryd"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Mark�r som fuldf�rt (RETMIG)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "Sva_r (RETMIG)"
+
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -9356,10 +12499,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
-#, fuzzy
-#~ msgid "Show all "
-#~ msgstr "Vis alt"
-
 #~ msgid "VFolder on Subject"
 #~ msgstr "vMappe for emne"
 
@@ -9372,27 +12511,15 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Mark as Read"
 #~ msgstr "Mark�r som _l�st"
 
-#~ msgid "Mark as Unread"
-#~ msgstr "Mark�r som ul�st"
-
 #~ msgid "Move to Folder..."
 #~ msgstr "Flyt til mappe..."
 
 #~ msgid "Copy to Folder..."
 #~ msgstr "Kopi�r til mappe..."
 
-#~ msgid "Undelete"
-#~ msgstr "Fortryd sletning"
-
 #~ msgid "Do you accept?"
 #~ msgstr "Accepterer du?"
 
-#~ msgid "View the selected folder"
-#~ msgstr "Vis den valgte mappe"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Udskriv ny meddelelse"
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Kopi�r meddelelse til en ny mappe"
 
@@ -9402,10 +12529,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Hide Deleted Messages"
 #~ msgstr "Skjul slettede beskeder"
 
-#, fuzzy
-#~ msgid "Open in New Window"
-#~ msgstr "_�pne i nytt vindu"
-
 #~ msgid "Print Preview of message..."
 #~ msgstr "Vis udskrift af besked..."
 
@@ -9423,12 +12546,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "View Raw Message Source"
 #~ msgstr "Vis r� beskedskildetekst"
 
-#~ msgid "_Attachment"
-#~ msgstr "_Bilag"
-
-#~ msgid "_Open Selected Items"
-#~ msgstr "_�bn valgte beskeder"
-
 #~ msgid "_Reply"
 #~ msgstr "_Svar"
 
@@ -9477,10 +12594,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
 #, fuzzy
-#~ msgid "Secure IMAPv4"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "For l�sning og gemning af e-post p� IMAP-tjenere."
 
@@ -9515,10 +12628,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "POP-tjenere."
 
 #, fuzzy
-#~ msgid "Remove action"
-#~ msgstr "Udf�r handlinger"
-
-#, fuzzy
 #~ msgid "Remove criterion"
 #~ msgstr "Tilf�j kriterie"
 
@@ -9537,9 +12646,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Advanced"
 #~ msgstr "Avanceret..."
 
-#~ msgid "Check settings"
-#~ msgstr "Sjekk innstillinger"
-
 #, fuzzy
 #~ msgid "Email address:"
 #~ msgstr "Epostadresse:"
@@ -9549,10 +12655,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Konfiguration af epost"
 
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "V�rt:"
-
-#, fuzzy
 #~ msgid "IMAP"
 #~ msgstr "IMAPv4"
 
@@ -9576,10 +12678,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Konfiguration af epost"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Alternativer"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Adgangskode"
 
@@ -9599,22 +12697,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "_N�dvendig deltager"
 
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
 #~ msgid "Server type:"
 #~ msgstr "Tjenertype:"
 
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
-#~ msgid "Source"
-#~ msgstr "Kilder"
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Gennemsigtig"
 
@@ -9703,9 +12789,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevar <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Opprinnelig forfatter:"
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9747,10 +12830,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "pilot-listen fra gnome-pilot daemonen"
 
 #, fuzzy
-#~ msgid "Configure the address conduit"
-#~ msgstr "Klik her for adressebogen"
-
-#, fuzzy
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolution kontoredigering"
 
@@ -9817,10 +12896,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Account Properties"
 #~ msgstr "Egenskaber for bilag"
 
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Epostadresse:"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "Ta med i \"Hent e-post\"-operasjoner."
 
@@ -9912,22 +12987,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Procentv�rdien skal v�re mellem 0 og 100, inklusive"
 
 #, fuzzy
-#~ msgid "Schedule meeting"
-#~ msgstr "Planl�g m�de"
-
-#, fuzzy
 #~ msgid "Edit this appointment..."
 #~ msgstr "Redig�r aftale"
 
 #, fuzzy
-#~ msgid "New"
-#~ msgstr "Nyheder"
-
-#, fuzzy
-#~ msgid "Saving changes to message..."
-#~ msgstr "Gemmer beskeder"
-
-#, fuzzy
 #~ msgid "Save changes to message..."
 #~ msgstr "Gem besked som..."
 
@@ -9973,9 +13036,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Sender '%s'"
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Legger til en melding uten emne"
-
 #, fuzzy
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "Flytter meddelelser til %s"
@@ -10006,14 +13066,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fejl ved udf�ring af operation:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -10042,10 +13094,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Fjerner abonnement p� mappe \"%s\""
 
 #, fuzzy
-#~ msgid "All Folders"
-#~ msgstr "Mapper"
-
-#, fuzzy
 #~ msgid "Display folders whose name contain:"
 #~ msgstr "Vis mapper som som starter med:"
 
@@ -10061,9 +13109,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Lokale gemmesteder har ikke en indbakke"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Lokale mapper kan ikke v�re rekursive."
-
 #, fuzzy
 #~ msgid "Page Set_up"
 #~ msgstr "Sideops�tning"
@@ -10100,10 +13145,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Sa_mmendrag:"
 
 #, fuzzy
-#~ msgid "Time"
-#~ msgstr "Titel"
-
-#, fuzzy
 #~ msgid "description"
 #~ msgstr "Beskrivelse:"
 
@@ -10196,14 +13237,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Du har ikke konfigurert en utboks"
 
 #, fuzzy
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke �bne fil `%s':\n"
-#~ "%s"
-
-#, fuzzy
 #~ msgid "Fetch email from %s"
 #~ msgstr "Epost fra %s"
 
@@ -10247,18 +13280,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "L�st"
 
-#, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "_�bn..."
-
 #~ msgid "_Undo"
 #~ msgstr "_Angre"
 
 #, fuzzy
-#~ msgid "Group %i"
-#~ msgstr "Gruppenavn:"
-
-#, fuzzy
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr "<b>Fejl ved indl�sning af kalender:<br>Metode ikke underst�ttet"
 
@@ -10267,20 +13292,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke indl�se opgaverne i '%s'"
 
 #, fuzzy
-#~ msgid "Could not create a folder in `%s'"
-#~ msgstr ""
-#~ "Kunne ikke oprette mappe `%s':\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid " for "
-#~ msgstr "for"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Vis alt "
-
-#, fuzzy
 #~ msgid "Hide selected"
 #~ msgstr "Skjul valgte beskeder"
 
@@ -10346,10 +13357,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Signaturfil:"
 
 #, fuzzy
-#~ msgid "Server:"
-#~ msgstr "Tjenertype:"
-
-#, fuzzy
 #~ msgid "Mail source type:"
 #~ msgstr "Filtype:"
 
@@ -10409,10 +13416,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "Kilder"
 
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Tilf�j tjeneste"
-
 #~ msgid "Edit News Server"
 #~ msgstr "Redig�r news-tjener"
 
@@ -10438,10 +13441,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Gennemsigtig"
 
 #, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "%s-tjener %s"
-
-#, fuzzy
 #~ msgid "News Sources"
 #~ msgstr "Kilder"
 
@@ -10540,9 +13539,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "Oppgavelisteoppf�ring som ikke har g�tt ut enn�:"
 
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Oppgavelisteoppf�ring som g�r ut idag:"
-
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Oppgavelisteoppf�ring som har g�tt ut:"
 
@@ -10560,10 +13556,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Load \"%s\""
 #~ msgstr "Last \"%s\""
 
-#, fuzzy
-#~ msgid "Synchronizing \"%s\""
-#~ msgstr "Synkroniserer mappe"
-
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synkronis�r \"%s\""
 
@@ -10707,10 +13699,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "I dag"
 
 #, fuzzy
-#~ msgid "last"
-#~ msgstr "Inds�t"
-
-#, fuzzy
 #~ msgid "this"
 #~ msgstr "."
 
@@ -10726,10 +13714,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "third"
 #~ msgstr "Andet"
 
-#, fuzzy
-#~ msgid "fourth"
-#~ msgstr "for"
-
 #~ msgid "fifth"
 #~ msgstr "femte"
 
@@ -10741,10 +13725,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Ul�st"
 
 #, fuzzy
-#~ msgid "eighth"
-#~ msgstr "H�jde:"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "Udskriv"
 
@@ -10758,9 +13738,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "twelfth"
 #~ msgstr "tolvte"
 
-#~ msgid "ago"
-#~ msgstr "siden"
-
 #, fuzzy
 #~ msgid "Could not create summary"
 #~ msgstr "Kunne ikke oprette r�r: %s"
@@ -10833,10 +13810,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke udf�re %s: besked ikke sendt."
 
 #, fuzzy
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "Kan ikke f� fat p� mappe: %s: %s"
-
-#, fuzzy
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
@@ -10845,14 +13818,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Ny aftale..."
 
 #, fuzzy
-#~ msgid "Create a new folder"
-#~ msgstr "Opretter en ny mappe"
-
-#, fuzzy
-#~ msgid "_Create New Folder..."
-#~ msgstr "Opretter en ny mappe"
-
-#, fuzzy
 #~ msgid "Monday\n"
 #~ msgstr "mandag"
 
@@ -10866,10 +13831,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "Outgoing"
 #~ msgstr "udg�ende"
 
-#, fuzzy
-#~ msgid "window2"
-#~ msgstr "nu"
-
 #~ msgid ""
 #~ "This appointment has custom recurrence rules that cannot be edited by "
 #~ "Evolution.\n"
@@ -10920,9 +13881,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Weeks start on"
 #~ msgstr "Uken starter p�"
 
-#~ msgid "Day range"
-#~ msgstr "Dagomr�de"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10938,10 +13896,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Day end:"
 #~ msgstr "Dato:"
 
-#, fuzzy
-#~ msgid "Colors for display"
-#~ msgstr "(Ingen mappe vist)"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Vis p� oppgavelisten:"
 
@@ -10968,10 +13922,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Preferences"
 #~ msgstr "�ndr ops�tning"
 
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "Egenskaber"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Pip ved visning av alarmer"
 
@@ -11027,10 +13977,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Din e-post tjener st�tter f�lgende typer autentisering. Vennligst"
 
 #, fuzzy
-#~ msgid "Threading message list"
-#~ msgstr "Tr�det meddelelsesliste"
-
-#, fuzzy
 #~ msgid "Thread message list"
 #~ msgstr "Tr�det meddelelsesliste"
 
@@ -11059,10 +14005,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "de dagen i m�neden"
 
 #, fuzzy
-#~ msgid "Copy Message"
-#~ msgstr "Kopierer beskeder"
-
-#, fuzzy
 #~ msgid "Quick Search"
 #~ msgstr "S�g"
 
@@ -11081,10 +14023,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Prim�r epost"
 
 #, fuzzy
-#~ msgid "Could not connect to IMAP server on %s."
-#~ msgstr "Kunne ikke koble til POP-tjener p� %s."
-
-#, fuzzy
 #~ msgid "_Summary:"
 #~ msgstr "Sammendrag:"
 
@@ -11156,10 +14094,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Dagen slutter:"
 
 #, fuzzy
-#~ msgid "Change"
-#~ msgstr "Foresatte"
-
-#, fuzzy
 #~ msgid "_Unselect All"
 #~ msgstr "V�lg alle"
 
@@ -11220,19 +14154,8 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "label8"
 #~ msgstr "etikett8"
 
-#, fuzzy
-#~ msgid "_Save..."
-#~ msgstr "_Gem som..."
-
 #~ msgid "Quit the message composer"
 #~ msgstr "Avslutt meldingsredigering"
 
-#, fuzzy
-#~ msgid "More criteria"
-#~ msgstr "Tilf�j kriterie"
-
-#~ msgid "Fewer criteria"
-#~ msgstr "F�rre kriterier"
-
 #~ msgid "Run filter \"%s\""
 #~ msgstr "Kj�r filter \"%s\""
diff --git a/po/de.po b/po/de.po
index ac4a001290..1c21dededd 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-07-30 18:20+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-30 18:29+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -327,8 +327,8 @@ msgstr "VCard f�r %s"
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:46
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:1017
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
@@ -342,14 +342,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/todo/todo-conduit.c:591
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:777
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -455,7 +455,7 @@ msgstr "FIXME DN-Bindungs-Hilfetext hier"
 
 #. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
@@ -509,15 +509,15 @@ msgstr "FIXME Pfad-Hilfetext hier"
 msgid "Create path if it doesn't exist."
 msgstr "Pfad erstellen wenn er noch nicht existiert."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Adressbuch bearbeiten"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "Adressbuch hinzuf�gen"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -525,22 +525,22 @@ msgstr ""
 "W�hlen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
 "Informationen ein."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Name:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME Hilfetext zum Namen hier"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Hilfetext zur Beschreibung hier"
 
@@ -641,15 +641,6 @@ msgstr "Kategorie enth�lt"
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#.
-#. * 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
-msgid "(none)"
-msgstr "(keine)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: addressbook/gui/contact-editor/e-contact-editor.c:1536
@@ -722,10 +713,10 @@ msgstr "Factory f�r die Namenauswahl-Schnittstelle des Adressbuchs"
 #: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -743,7 +734,8 @@ msgstr "Namenloser Kontakt"
 
 #: addressbook/gui/component/select-names/e-select-names.c:403
 msgid "Unable to get local storage.  This should never happen."
-msgstr "Lokaler Speicher kann nicht erreicht werden. Dies sollte nie passieren."
+msgstr ""
+"Lokaler Speicher kann nicht erreicht werden. Dies sollte nie passieren."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
@@ -850,10 +842,10 @@ msgstr "Kontakte..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1450
+#: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "L�schen"
 
@@ -1336,7 +1328,7 @@ msgstr "Nachricht an Kontakt schicken"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Drucken"
@@ -1348,10 +1340,10 @@ msgstr "Umschlag drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "L�schen"
 
@@ -1733,18 +1725,18 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:547
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/calendar/calendar-conduit.c:840
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:655
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -1892,7 +1884,35 @@ msgstr "gnome-vfs konnte nicht initialisiert werden"
 msgid "Could not create the alarm notify service factory"
 msgstr "Factory f�r Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a, %d. %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %d. %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1900,22 +1920,27 @@ msgstr ""
 "ORBit und OAF Einstellungen. "
 
 #: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:306
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "�ffentlich"
 
 #: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
@@ -1937,56 +1962,58 @@ msgstr "O"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Niedrig"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Storniert"
@@ -2020,12 +2047,13 @@ msgstr ""
 "sein"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
-#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
-#: mail/mail-account-gui.c:1379 mail/mail-accounts.c:134
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
 #: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
@@ -2033,7 +2061,7 @@ msgstr ""
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1086
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2043,39 +2071,43 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlie�lich) sein"
 
-#: calendar/gui/calendar-model.c:1167
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Die Priorit�t muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1221
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nein"
 
@@ -2273,11 +2305,12 @@ msgstr "Zusammenfassung:"
 msgid "_Options..."
 msgstr "_Optionen..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "vor"
 
@@ -2385,7 +2418,7 @@ msgid "Fri"
 msgstr "Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Freitag"
 
@@ -2394,7 +2427,7 @@ msgid "Mon"
 msgstr "Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Montag"
 
@@ -2415,7 +2448,7 @@ msgid "Sat"
 msgstr "Sa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -2436,7 +2469,7 @@ msgid "Sun"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -2453,7 +2486,7 @@ msgid "Thu"
 msgstr "Do"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -2478,7 +2511,7 @@ msgid "Tue"
 msgstr "Di"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -2487,7 +2520,7 @@ msgid "Wed"
 msgstr "Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -2569,27 +2602,27 @@ 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:154
-#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " an "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (F�llig am "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "F�llig am "
 
@@ -2631,7 +2664,7 @@ msgstr ""
 "�berschreiben?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Speichern unter..."
 
@@ -2764,15 +2797,135 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenname:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Quelle"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Auto"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Ben�tigte Information"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Optionale Information"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Eine Aktion w�hlen"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Gel�scht"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Vorl�ufig"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Gel�scht"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "In Bearbeitung"
+
 #: calendar/gui/dialogs/meeting-page.c:712
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autotelefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Ben�tigte Information"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Optionale Information"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
 #: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Verschickt durch:"
 
-#: calendar/gui/dialogs/meeting-page.c:1445
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -2809,7 +2962,7 @@ msgid "Role"
 msgstr "Position"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:32
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
@@ -2838,34 +2991,34 @@ msgstr "Andere _einladen"
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:587
+#: calendar/gui/dialogs/recurrence-page.c:584
 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:952
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1108
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1116
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1286
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -2963,7 +3116,7 @@ msgid "No one"
 msgstr "Niemanden"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2996,102 +3149,106 @@ msgstr "_Priorit�t:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:840
-msgid "Edit this task"
-msgstr "Diese Aufgabe bearbeiten"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "�_ffnen"
 
-#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
-msgid "Cut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:842 calendar/gui/e-calendar-table.c:852
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
-msgid "Copy"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
-msgid "Paste"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
 msgstr "Einf�gen"
 
-#: calendar/gui/e-calendar-table.c:845
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:846
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Diese Aufgabe l�schen"
 
-#: calendar/gui/e-calendar-table.c:855
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben l�schen"
 
-#: calendar/gui/e-calendar-table.c:1122
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Hier klicken, um eine Aufgabe hinzuzuf�gen"
 
@@ -3165,13 +3322,6 @@ msgstr "%02i Minuten-Unterteilungen"
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-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:1357
@@ -3191,121 +3341,124 @@ msgstr "AM"
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Neues ganzt�giges Ereignis"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "Zum heutigen Tag"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Zum _heutigen Tag"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:468 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�ffnen"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Diesen Termin l�schen"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Dieses Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Jedes Auftreten l�schen"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Dies ist ein Ereignis, das zu Ihrem Kalender hinzugef�gt werden kann."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Dies ist eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Dies sind ein oder mehrere Nachtr�ge zu einer aktuellen Besprechung."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Dies ist eine Anfrage zu den neuesten Ereignisinformationen."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Dies ist eine Antwort auf eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Dies ist eine Ereignisstornierung."
 
-#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Diese Nachricht ist unverst�ndlich."
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Dies ist eine Aufgabe, die zu Ihrem Kalender hinzugef�gt werden kann."
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Dies ist eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Dies ist eine Anfrage zur neuesten Aufgabeninformation."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Dies ist eine Antwort auf eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Dies ist eine Aufgabenstornierung."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Dies sind Verf�gbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Dies ist eine Anfrage um Verf�gbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Dies ist eine Antwort auf eine Verf�gbarkeitsanfrage."
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht schein formell ung�ltig zu sein"
 
-#: calendar/gui/e-itip-control.c:845
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Die Nachricht enth�lt keine unterst�tzten Anfragen."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Die in diesem Anhang enthaltene Information war ung�ltig."
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
@@ -3374,20 +3527,17 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Jedes Auftreten l�schen"
-
-#: calendar/gui/gnome-cal.c:969
+#: calendar/gui/gnome-cal.c:999
 #, 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:980
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3658,7 +3808,7 @@ msgstr "Eintrag drucken"
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
@@ -3746,7 +3896,7 @@ msgstr ""
 "%s\n"
 "�nderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:280
+#: camel/camel-disco-diary.c:278
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
@@ -3767,7 +3917,6 @@ msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
@@ -5650,11 +5799,11 @@ msgstr "Datei �ffnen"
 msgid "Insert File"
 msgstr "Datei einf�gen"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2245
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Erstellungsfenster konnte nicht erzeugt werden."
 
@@ -5944,9 +6093,9 @@ msgid "outgoing"
 msgstr "Ausgang"
 
 #: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "Hinzuf�gen"
 
@@ -5994,202 +6143,197 @@ msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
 msgid "with all local folders"
 msgstr "mit allen lokalen Ordnern"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "enth�lt"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Gel�scht"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "enth�lt nicht"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "endet nicht mit"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "existiert nicht"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "klingt nicht wie"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "beginnt nicht mit"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "endet mit"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existiert"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Weiterleiten an Adresse"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Wichtig"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "ist"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "ist gr��er als"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "ist nicht"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Nachricht wurde verschickt"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "am oder nach"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "am oder vor"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Empf�nger"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Gr��e (kB)"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "klingt wie"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "beginnt mit"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:34 mail/mail-format.c:866
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:37
-msgid "contains"
-msgstr "enth�lt"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not contain"
-msgstr "enth�lt nicht"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not end with"
-msgstr "endet nicht mit"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not exist"
-msgstr "existiert nicht"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not sound like"
-msgstr "klingt nicht wie"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not start with"
-msgstr "beginnt nicht mit"
-
-#: filter/libfilter-i18n.h:43
-msgid "ends with"
-msgstr "endet mit"
-
-#: filter/libfilter-i18n.h:44
-msgid "exists"
-msgstr "existiert"
-
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "ist gr��er als"
-
-#: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: filter/libfilter-i18n.h:47
-msgid "is not"
-msgstr "ist nicht"
-
-#: filter/libfilter-i18n.h:48
-msgid "is"
-msgstr "ist"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or after"
-msgstr "am oder nach"
-
-#: filter/libfilter-i18n.h:50
-msgid "on or before"
-msgstr "am oder vor"
-
-#: filter/libfilter-i18n.h:51
-msgid "sounds like"
-msgstr "klingt wie"
-
 #: filter/libfilter-i18n.h:52
-msgid "starts with"
-msgstr "beginnt mit"
-
-#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "war vor"
 
@@ -6379,32 +6523,28 @@ msgstr "Filter �ber _Empf�nger"
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "�_ffnen"
-
 #: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Nochmals schicken"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
@@ -6412,11 +6552,11 @@ msgstr "_Allen antworten"
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
@@ -6436,7 +6576,7 @@ msgstr "In Ordner verschieben..."
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "L�schen r�ckg�ngig"
 
@@ -6800,7 +6940,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Evolution-Account-Druide"
 
-#: mail/mail-config.c:1589 mail/mail-config.c:1592
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -6916,8 +7056,7 @@ msgstr "Entw�rfe"
 msgid "Drafts folder:"
 msgstr "Entw�rfe-Ordner:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
@@ -7039,7 +7178,8 @@ msgstr "Beim Abschicken von Nachrichten ohne Betreff nachfragen"
 
 #: mail/mail-config.glade.h:73
 msgid "Prompt when sending messages with only Bcc recipients defined"
-msgstr "Beim Abschicken von Nachrichten mit ausschlie�lich BCC-Empf�ngern nachfragen"
+msgstr ""
+"Beim Abschicken von Nachrichten mit ausschlie�lich BCC-Empf�ngern nachfragen"
 
 #: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
@@ -7281,84 +7421,94 @@ msgstr "%d nicht verschickt"
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/mail-format.c:608
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:657
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:739
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:3
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-Mail-Adresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:861 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1283
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1298
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Verschl�sselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1304
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Verschl�sselte Nachricht"
 
-#: mail/mail-format.c:1305
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Zum Entschl�sseln Icon klicken."
 
-#: mail/mail-format.c:1361
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert und wurde als authentisch nachgewiesen."
 
-#: mail/mail-format.c:1369
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert, kann aber nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:2023
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) g�ltig auf Site \"%s\""
 
-#: mail/mail-format.c:2039
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
@@ -7414,7 +7564,7 @@ msgstr ""
 "Fehler beim Ausf�hren eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:785
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -7612,36 +7762,29 @@ msgstr "Verschicken"
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-tools.c:175
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Tempor�re Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:228
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: (kein Betreff)]"
-
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:247
-msgid "Forwarded message (no subject)"
-msgstr "Weitergeleitete Nachricht (kein Betreff)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Weitergeleitete Nachrichten"
 
 #: mail/mail-tools.c:469
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %"
-"s<br><b>Betreff:</b> %s<br>"
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Weitergeleitete Nachrichten"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7792,31 +7935,32 @@ msgstr "%a %H.%M"
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 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:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "Einstellungen von My Evolution"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Beim Herunterladen des Newsstromes ist ein Fehler aufgetreten</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fehler beim Herunterladen von RDF</b>"
 
@@ -7831,8 +7975,8 @@ msgstr "Mein Wetter"
 #: my-evolution/e-summary-weather.c:313
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
-"b></dd>"
+"<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen "
+"werden</b></dd>"
 
 #: my-evolution/e-summary-weather.c:643
 msgid "Regions"
@@ -7854,38 +7998,6 @@ msgstr "Drucken von My Evolution fehlgeschlagen"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
-#: my-evolution/metar.c:29
-msgid "�F"
-msgstr "�F"
-
-#: my-evolution/metar.c:29
-msgid "�C"
-msgstr "�C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "Knoten"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Zoll Hg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "Torr"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "Meilen"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "Kilometer"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Wolkenloser Himmel"
@@ -9133,14 +9245,10 @@ msgid "Weather settings"
 msgstr "Wetter-Einstellungen"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "Verfolgungen auswischen"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "englisch"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metrisch"
 
@@ -9297,7 +9405,7 @@ msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 msgid "Rename folder '%s'"
 msgstr "Ordner '%s' umbenennen"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9306,11 +9414,11 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Der angegebene Ordnername ist nicht g�ltig"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
@@ -9553,92 +9661,96 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Verkn�pfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Ausgew�hlte Verkn�pfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verkn�pfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Gro�e Icons"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verkn�pfungen als gro�e Icons zeigen"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verkn�pfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Diese Verkn�pfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Diese Verkn�pfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verkn�pfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Die Verkn�pfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Verkn�pfung umbenennen"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Ausgew�hlte Verkn�pfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�ffnen"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser Verkn�pfung verbundenen Ordner �ffnen"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "In neuem Fenster �ffnen"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 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:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Diese Verkn�pfung umbenennen"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verkn�pfung aus der Verkn�pfungsleiste entfernen"
 
@@ -9708,7 +9820,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:173
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
@@ -9834,10 +9945,10 @@ msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Ausschneiden"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopieren"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
@@ -9851,6 +9962,10 @@ msgstr "Einen neuen Kontakt anlegen"
 msgid "Create new contact list"
 msgstr "Neuen Kontaktliste anlegen"
 
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Ausschneiden"
+
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
@@ -9867,6 +9982,10 @@ msgstr "Neuer Kontakt"
 msgid "New list"
 msgstr "Neue Liste"
 
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Einf�gen"
+
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einf�gen"
@@ -9907,16 +10026,6 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "_Kontaktgruppe"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "Kopieren"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "Einf�gen"
-
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9955,7 +10064,7 @@ msgstr "Einen neuen Termin anlegen"
 msgid "Create an event for the whole day"
 msgstr "Ein ganzt�giges Ereignis anlegen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Gehe zu"
 
@@ -9971,10 +10080,6 @@ msgstr "In der Zeit vorangehen"
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Zum _heutigen Tag"
-
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
@@ -9983,6 +10088,10 @@ msgstr "Zu bestimmtem Datum gehen"
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Neuer Termin"
+
 #: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
@@ -10068,7 +10177,7 @@ msgstr "Hauptwerkzeugleiste"
 msgid "Preview the printed item"
 msgstr "Eine Vorschau des zu druckenden Objektes zeigen"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Druckvorschau"
 
@@ -10558,172 +10667,207 @@ msgstr "Die ausgew�hlte Nachricht an jemanden weiterleiten"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die ausgew�hlte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Die gew�hlten Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Die ausgew�hlten Nachrichten als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Die ausgew�hlten Nachrichten als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Die ausgew�hlten Nachrichten als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum L�schen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Die n�chste wichtige Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Meldung"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "_Strang ausw�hlen"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Unbenannte Nachricht"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Die ausgew�hlte Nachricht in einem neuen Fenster �ffnen"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die gew�hlte Nachrichten im Maileditor �ffnen, um sie nochmals zu verschicken"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Zur�ck"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Die letzte wichtige Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Nachricht drucken"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Die letzte ungelesene Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Druckvorschau..."
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Antworten"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "Nachricht durch_suchen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quellcode zeigen"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil zeigen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen zeigen"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Den rohen E-Mail-Quellcode dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "L�schen f�r ausgew�hlte Nachrichten r�ckg�ngig machen"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner �ber Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner �ber _Absender..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner �ber _Empf�nger..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VOrdner �ber _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "Nachricht _�ffnen"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Nachricht _nochmals verschicken"
 
@@ -10993,45 +11137,47 @@ msgid "Re_fresh Task"
 msgstr "Aufgabe _aktualisieren"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Einstellungen des Kalenders konfigurieren"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Ausgew�hlte Aufgabe kopieren"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Ausgew�hlte Aufgabe ausschneiden"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Ausgew�hlte Aufgaben l�schen"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Aufgabe aus der Zwischenablage einf�gen"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Aufgabe als etwas anderes speichern"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Aufgaben-Ansichtseinstellungen �ndern"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "TasksPreferences"
-msgstr "Aufgaben-Vorlieben"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Aufgaben-Einstellungen..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Aufgabe"
 
-#: ui/evolution-tasks.xml.h:19
-msgid "_Tasks Settings..."
-msgstr "_Aufgaben-Einstellungen..."
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "�ber Evolution..."
@@ -11267,10 +11413,6 @@ msgstr "Mit Kategorie"
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Vorl�ufig"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Besch�ftigt"
@@ -11357,11 +11499,6 @@ msgstr "Ansichten definieren"
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Jetzt"
@@ -11468,11 +11605,11 @@ msgstr "Suche speichren"
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Alle zeigen"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Komplex..."
 
@@ -11524,3 +11661,64 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Aufgaben-Ansichtseinstellungen �ndern"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Aufgaben-Vorlieben"
+
+#~ msgid "(none)"
+#~ msgstr "(keine)"
+
+#~ msgid "Edit this task"
+#~ msgstr "Diese Aufgabe bearbeiten"
+
+#~ msgid "Go to Today"
+#~ msgstr "Zum heutigen Tag"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Jedes Auftreten l�schen"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Weiterleiten an Adresse"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: (kein Betreff)]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Weitergeleitete Nachricht (kein Betreff)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> "
+#~ "%s<br><b>Betreff:</b> %s<br>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ msgid "�C"
+#~ msgstr "�C"
+
+#~ msgid "knots"
+#~ msgstr "Knoten"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "Zoll Hg"
+
+#~ msgid "mmHg"
+#~ msgstr "Torr"
+
+#~ msgid "miles"
+#~ msgstr "Meilen"
+
+#~ msgid "kilometers"
+#~ msgstr "Kilometer"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "Verfolgungen auswischen"
diff --git a/po/el.po b/po/el.po
index 303c9a121c..44f9fd886b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-04-04 19:42-0500\n"
 "Last-Translator: Spiros Papadimitriou <spapadim+@cs.cmu.edu>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,26 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "����������� ��������"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +254,10 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
@@ -261,14 +271,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
@@ -278,761 +288,885 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Evolution component for handling contacts."
+msgstr "�������� ��� �������� ���������"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/addressbook-config.c:148
+#, fuzzy
+msgid "LDAP Server"
+msgstr "��� �����"
+
+#: addressbook/gui/component/addressbook-config.c:150
+#, fuzzy
+msgid "File"
+msgstr "_��������"
+
+#: addressbook/gui/component/addressbook-config.c:153
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "����������"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "��� ����������"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "�������������"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Path:"
+msgstr "����������"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:663
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/addressbook-config.c:665
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "��� ����������"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:118
+#, fuzzy
+msgid "Other Contacts"
+msgstr "������ ������������"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:373
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+#, fuzzy
+msgid "Any field contains"
+msgstr "������� ��� �������� ������������"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+#, fuzzy
+msgid "Email contains"
+msgstr "����� ���������"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "����� ���������"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "�� URI ��� �� ��������� � ����������� ��������"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "�����_����� �����������"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "���������� ��� �������..."
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "������ ������������"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "���� ��� ��� �� ���������������"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "��������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "��������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "��������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "������ ������������"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#, fuzzy
+msgid "Message Recipients"
+msgstr "��������� ���������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Select Names"
+msgstr "�����_����� �����������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "�����_����� �����������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "�������������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_��������"
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 #, fuzzy
 msgid "No_tes:"
 msgstr "������_��"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr ""
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 #, fuzzy
-msgid "_Company:"
-msgstr "���������"
+msgid "_Contacts..."
+msgstr "_��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Home"
 msgstr "������_��"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Job title:"
 msgstr "_������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "_Mobile"
 msgstr "_������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "�������� ���������"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 #, fuzzy
 msgid "Company"
 msgstr "���������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 #, fuzzy
 msgid "Home"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 #, fuzzy
 msgid "Home 2"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 #, fuzzy
 msgid "Home Fax"
 msgstr "������_��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 #, fuzzy
 msgid "Mobile"
 msgstr "_������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 #, fuzzy
 msgid "Pager"
 msgstr "����������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
 msgid "Primary"
 msgstr "�������������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 #, fuzzy
 msgid "Edit Full"
 msgstr "_��������"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "����������� ������"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 #, fuzzy
 msgid "E-mail"
 msgstr "_������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 #, fuzzy
 msgid "Canada"
 msgstr "����������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 #, fuzzy
 msgid "_City:"
 msgstr "�������������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 #, fuzzy
 msgid "_Middle:"
 msgstr "_������"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:427
-#, fuzzy
-msgid "Unable to open addressbook"
-msgstr "���� ��� ��� �� ���������������"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Advanced..."
-msgstr "��������� ��� �������������"
-
-#: addressbook/gui/component/addressbook.c:587
-#, fuzzy
-msgid "Any field contains"
-msgstr "������� ��� �������� ������������"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:589
-#, fuzzy
-msgid "Email contains"
-msgstr "����� ���������"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "�� URI ��� �� ��������� � ����������� ��������"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-#, fuzzy
-msgid "Other Contacts"
-msgstr "������ ������������"
-
-#: addressbook/gui/component/addressbook-config.c:148
-#, fuzzy
-msgid "LDAP Server"
-msgstr "��� �����"
-
-#: addressbook/gui/component/addressbook-config.c:150
-#, fuzzy
-msgid "File"
-msgstr "_��������"
+msgid "List _name:"
+msgstr "����������� ������"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "���� ��� ��� �� ���������������"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr ""
+msgid "Members"
+msgstr "��������"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Base"
-msgstr "����������"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:183
-#, fuzzy
-msgid "Subtree"
-msgstr "��� ����������"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
+msgid "_Remove"
+msgstr "��������"
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
-msgid "Port:"
-msgstr "�������������"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr ""
+msgid "contact-list-editor"
+msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Path:"
-msgstr "����������"
+msgid "Contact List Editor"
+msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "���� ��� ��� �� ���������������"
+msgid "New Contact:"
+msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "���� ��� ��� �� ���������������"
+msgid "Original Contact:"
+msgstr "������ ������������"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "��� ����������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Add to Contacts"
+msgid "Changed Contact:"
 msgstr "������ ������������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "�_����� ������������ ��� Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Evolution component for handling contacts."
-msgstr "�������� ��� �������� ���������"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "���� ��� ��� �� ���������������"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "��������"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-#, fuzzy
-msgid "Remove All"
-msgstr "��������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#, fuzzy
-msgid "Find..."
-msgstr "�������������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
-msgid "Message Recipients"
-msgstr "��������� ���������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Select Names"
-msgstr "�����_����� �����������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select name from:"
-msgstr "�����_����� �����������"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1147,177 +1281,270 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "_��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print"
 msgstr "�������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "�������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "��� ����������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "��������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "����������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "������ ������������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "�������� �������� ���������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "_��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "_������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "�������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "������_��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "�������� �������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "������_��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "������ ������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "�_��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "��� ����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "������_��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "������_��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "����������"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1358,7 +1585,7 @@ msgstr "�_��������"
 
 #: addressbook/printing/e-contact-print.glade.h:7
 #, fuzzy
-msgid "Font..."
+msgid "F_ont..."
 msgstr "�������������"
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1422,7 +1649,6 @@ msgid "Margins"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr ""
 
@@ -1514,145 +1740,327 @@ msgstr "����:"
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "�������������"
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 #, fuzzy
-msgid "Open calendar"
-msgstr "�� ���������� ���"
+msgid "Evolution calendar executive summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: calendar/gui/calendar-commands.c:332
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
-msgid "Save calendar"
-msgstr "�� ���������� ���"
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "�_�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "_��������"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "�������"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "�_�������"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+#, fuzzy
+msgid "Snooze"
+msgstr "�������"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:402
+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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 #, fuzzy
 msgid "Private"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 #, fuzzy
 msgid "Normal"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 #, fuzzy
 msgid "Low"
 msgstr "_���"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1660,170 +2068,325 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 #, fuzzy
 msgid "None"
 msgstr "������_��"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "_���"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_���"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "���������"
+
+#: calendar/gui/control-factory.c:128
+#, fuzzy
+msgid "The URI that the calendar will display"
+msgstr "�� URI ��� �� ��������� � ����������� ��������"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "����������"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "��������� ���������"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/dialogs/alarm-options.glade.h:1
 #, fuzzy
-msgid "Show appointments"
-msgstr "�_�������"
+msgid "Alarm Repeat"
+msgstr "���������"
 
-#: calendar/gui/calendar-summary.c:629
-#, fuzzy
-msgid "Show tasks"
-msgstr "�������� �������_����"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
-msgid "Loading Calendar"
-msgstr "����������"
+msgid "Message to Display"
+msgstr "��������� ���������"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 #, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "�� URI ��� �� ��������� � ����������� ��������"
+msgid "days"
+msgstr "��������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.c:286
 #, fuzzy
-msgid "Snooze"
-msgstr "�������"
+msgid "1 day"
+msgstr "��������"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "���������"
+
+#: calendar/gui/dialogs/alarm-page.c:301
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+msgid "1 minute"
+msgstr "���������"
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.c:306
 #, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "���������� ��� ��������� ���� ����������� �������"
+msgid "1 second"
+msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "�_�������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "����������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "����������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Reminders"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "�_��������"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "����������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 #, fuzzy
-msgid "Edit appointment"
+msgid "day(s)"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "���������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "�_�������"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #, fuzzy
 msgid "05 minutes"
@@ -1858,40 +2421,38 @@ msgid "60 minutes"
 msgstr "���������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "Audio Alarms"
-msgstr "����������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 #, fuzzy
 msgid "Calendar"
 msgstr "����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "Calendar Preferences"
 msgstr "����������"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors"
-msgstr "_��������"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1899,1093 +2460,1176 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
 msgid "Friday"
 msgstr "�������������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 #, fuzzy
 msgid "Monday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "�������������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
 msgid "Remind me of all appointments"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-msgid "Reminders"
-msgstr "��������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
-msgid "Show appointment end times"
+msgid "Show appointment end times in week and month views"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "Start of day:"
 msgstr "��_���� ����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 #, fuzzy
 msgid "Sunday"
 msgstr "��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
-msgid "TaskPad"
-msgstr "�������_����"
+msgid "Task List"
+msgstr "��������� ������������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "_��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr "������_��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
 msgid "Tuesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#, fuzzy
-msgid "Visual Alarms"
-msgstr "_��������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work Week"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "seconds."
-msgstr "��������"
-
-#: calendar/gui/dialogs/delete-comp.c:70
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Date & Time"
-msgstr "����������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Pri_vate"
-msgstr "����������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Progress"
-msgstr "�_��������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Sta_rt Date:"
-msgstr "��_���� ����������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "��������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-#, fuzzy
-msgid "Task"
-msgstr "�������_����"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-#, fuzzy
-msgid "_Contacts..."
-msgstr "_��������"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-msgid "_Priority:"
-msgstr "�������������"
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#, fuzzy
-msgid "_Status:"
-msgstr "��������� ��������"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "�_�������"
+
+#: calendar/gui/dialogs/comp-editor.c:454
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/comp-editor.c:457
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "������������"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/comp-editor.c:460
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "���������� �����_������"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-#, fuzzy
-msgid "End Date"
-msgstr "��_���� ����������"
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Start Date"
-msgstr "��_���� ����������"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Summary"
-msgstr "��������"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-#, fuzzy
-msgid "Alarms"
-msgstr "����������"
-
-#: calendar/gui/e-calendar-table.c:170
-#, fuzzy
-msgid "Click here to add a task"
-msgstr "���� ��� ��� �� ���������������"
-
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
-msgid "0%"
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
-msgid "20%"
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
-msgid "40%"
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "60%"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "70%"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "80%"
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "�����_����� �����������"
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "�_��������"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "������_��"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr ""
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "�_�������"
 
-#: calendar/gui/e-calendar-table.c:558
+#: calendar/gui/dialogs/event-editor.c:159
 #, fuzzy
-msgid "Edit the task"
-msgstr "�������� �������� ���������"
+msgid "Reminder"
+msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/dialogs/event-editor.c:164
 #, fuzzy
-msgid "Delete this task"
+msgid "Recurrence"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-calendar-table.c:561
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 #, fuzzy
-msgid "Delete the task"
-msgstr "�������� �������� ���������"
+msgid "Meeting"
+msgstr "������"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "����������"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Pri_vate"
+msgstr "����������"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 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:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "��������"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "_End time:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#, fuzzy
+msgid "_Start time:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "New Appointment"
-msgstr "�_�������"
+msgid "Resource"
+msgstr "��� ����������"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-#, fuzzy
-msgid "Go to Today"
-msgstr "������"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-#, fuzzy
-msgid "Go to Date..."
-msgstr "���������� ��� �������..."
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-#, fuzzy
-msgid "Open"
-msgstr "����_���"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Delete this Appointment"
-msgstr "�������� �������� ���������"
+msgid "Needs Action"
+msgstr "�������� ������"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Make this Occurrence Movable"
-msgstr "�������� �������� ���������"
+msgid "Declined"
+msgstr "������"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Delete this Occurrence"
-msgstr "�������� �������� ���������"
+msgid "Delegated"
+msgstr "����������"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "�������� �������� ���������"
+msgid "In Process"
+msgstr "�_��������"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "��������"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "����������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 #, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+msgid "Role"
+msgstr "_������"
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 #, fuzzy
-msgid "Add to Calendar"
-msgstr "�� ���������� ���"
+msgid "Status"
+msgstr "��������� ��������"
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-#, fuzzy
-msgid "Update Calendar"
-msgstr "����������"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.c:938
 #, fuzzy
-msgid "Calendar Message"
-msgstr "����������"
+msgid "on"
+msgstr "����"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
-msgid "Date:"
-msgstr "����������"
+msgid "on the"
+msgstr "���������"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
-msgid "Loading calendar..."
-msgstr "����������"
+msgid "occurrences"
+msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid "Server Message:"
-msgstr "����������� ��������"
+msgid "Exceptions"
+msgstr "�_��������"
 
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 #, fuzzy
-msgid "Summary:"
-msgstr "��������"
+msgid "No recurrence"
+msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#, fuzzy
+msgid "month(s)"
+msgstr "���������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "��_���� ����������"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "�����_����� �����������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "������_��"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/dialogs/task-editor.c:130
+#, fuzzy
+msgid "Task"
+msgstr "�������_����"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:14
 #, fuzzy
-msgid "Role"
-msgstr "_������"
+msgid "Progress"
+msgstr "�_��������"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/dialogs/task-page.glade.h:16
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "��_���� ����������"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
+#: calendar/gui/dialogs/task-page.glade.h:22
 #, fuzzy
-msgid "Status"
+msgid "_Priority:"
+msgstr "�������������"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+#, fuzzy
+msgid "_Status:"
 msgstr "��������� ��������"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "�������� ���� ���������"
-
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "20%"
 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/e-week-view-main-item.c:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-#, fuzzy
-msgid "New Appointment..."
-msgstr "�_�������"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "�������� �������� ���������"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-#, fuzzy
-msgid "Appointment"
-msgstr "�_�������"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "�_�������"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "�������� �������� ���������"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "Exceptions"
-msgstr "�_��������"
+msgid "_Open"
+msgstr "����_���"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
-msgid "Modify"
-msgstr "������"
+msgid "C_ut"
+msgstr "����"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
 #, fuzzy
-msgid "No recurrence"
-msgstr "�������� �������� ���������"
+msgid "_Copy"
+msgstr "���������"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
+msgstr "����������"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "_������"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Recurrence"
+msgid "_Delete this Task"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Recurrence Rule"
+msgid "_Mark Tasks as Complete"
+msgstr "_������"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
-msgid "Reminder"
-msgstr "��������"
+msgid "Click here to add a task"
+msgstr "���� ��� ��� �� ���������������"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
-msgid "Send an email"
-msgstr "��������"
+msgid "Alarms"
+msgstr "����������"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-#, fuzzy
-msgid "Settings..."
-msgstr "�_��������"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
-msgid "_End time:"
+msgid "End Date"
 msgstr "��_���� ����������"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "�������������"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
-msgid "_Start time:"
+msgid "Start Date"
 msgstr "��_���� ����������"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
-msgid "_Starting date:"
-msgstr "��_���� ����������"
+msgid "Summary"
+msgstr "��������"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
+#: calendar/gui/e-calendar-table.etspec.h:15
 #, fuzzy
-msgid "after"
-msgstr "����������"
+msgid "Task sort"
+msgstr "��������� ������������"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-#, fuzzy
-msgid "day(s)"
-msgstr "��������"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "end of appointment"
-msgstr "�_�������"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#. 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:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#. 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:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "minute(s)"
-msgstr "���������"
+msgid "New _Appointment"
+msgstr "�_�������"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "month(s)"
-msgstr "���������"
+msgid "New All Day _Event"
+msgstr "���������� ��� �������..."
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "start of appointment"
-msgstr "�_�������"
+msgid "Go to _Today"
+msgstr "������"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "���������� ��� �������..."
+
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "�_�������"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:451
-#, fuzzy
-msgid "on"
-msgstr "����"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "on the"
-msgstr "���������"
+msgid "The message is not understandable."
+msgstr "��������� ���������"
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-#, fuzzy
-msgid "occurrences"
-msgstr "�������� �������� ���������"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "��������"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-#, fuzzy
-msgid " 1 day"
-msgstr "��������"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, fuzzy, c-format
-msgid " %d minutes"
-msgstr "���������"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-#, fuzzy
-msgid " 1 minute"
-msgstr "���������"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "��������"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1556
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid " 1 second"
-msgstr "��������"
+msgid "Calendar Message"
+msgstr "����������"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
-msgid " before start of appointment"
-msgstr "�������� �������� ���������"
+msgid "Date:"
+msgstr "����������"
 
-#: calendar/gui/event-editor.c:1605
+#: calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
-msgid " after start of appointment"
-msgstr "�������� �������� ���������"
+msgid "Loading Calendar"
+msgstr "����������"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
-msgid " before end of appointment"
-msgstr "�������� �������� ���������"
+msgid "Loading calendar..."
+msgstr "����������"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid " after end of appointment"
-msgstr "�_�������"
+msgid "Server Message:"
+msgstr "����������� ��������"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "�_����� ������������ ��� Evolution"
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+#: calendar/gui/e-tasks.c:403
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "�������� ���� ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+msgid "New _Appointment..."
+msgstr "�_�������"
 
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3013,241 +3657,258 @@ msgid "Go To Date"
 msgstr "������"
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "Go To Today"
-msgstr "������"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "������"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "������"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 #, fuzzy
 msgid "Fr"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "�������_����"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 #, fuzzy
 msgid "Print Calendar"
 msgstr "����������"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "�������������"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
@@ -3284,86 +3945,106 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "���� ��� ��� �� ���������������"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "��� ��������"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "����������� ��������"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr ""
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "��� ��������"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�������� �������� ���������"
@@ -3395,14 +4076,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3417,113 +4117,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr ""
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, fuzzy, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3542,38 +4237,38 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "�� ���������� ���"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3670,145 +4365,239 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "�������_����"
+msgid "Failed to decode message."
+msgstr "�������� �������� ���������"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "����"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr "�������� ���� ���������"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�������� ��� ���������"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "���������� ��� �������..."
+msgid "Scanning for changed messages"
+msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "����������� ��������"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3817,7 +4606,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 #, fuzzy
 msgid "Folders"
 msgstr "_��������"
@@ -3851,28 +4640,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3880,117 +4669,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "�������� ��� ��������� ��� ���������"
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
+msgid "No such folder %s"
+msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "�������� ��� ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3998,14 +4796,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, fuzzy, c-format
 msgid ""
@@ -4013,28 +4811,41 @@ msgid ""
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -4044,20 +4855,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4096,82 +4912,99 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "_���� ��������"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
@@ -4181,39 +5014,97 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "��������� ���������"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4226,24 +5117,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4253,21 +5144,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr "����������� ��������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "�������� ���� ���������"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "��� ��������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "�������� ���� ���������"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4287,7 +5188,7 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Delete after %s day(s)"
 msgstr "�������� �������� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4315,53 +5216,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "��������"
@@ -4415,7 +5321,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4423,124 +5329,124 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "����������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4548,197 +5454,199 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "����������� ��������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "��� ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "��������� �������"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "�������� ����������� ������������ ��� ��� �������� �����������"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "��� ���������..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "��������� ������� ��� ������"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-#, fuzzy
-msgid "Attachment"
-msgstr "��� ���������"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 #, fuzzy
 msgid "Attachment properties"
 msgstr "���������"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 #, fuzzy
 msgid "File name:"
 msgstr "����������� ������"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "��� ���������"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "�_��������"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ���������������"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 #, fuzzy
 msgid "From:"
 msgstr "���"
@@ -4746,38 +5654,38 @@ msgstr "���"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "����� ���������:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4785,92 +5693,126 @@ msgstr ""
 "�������� ��� ����������� ���� �� ������ ��������� ��� ��������� ����� ����� "
 "�� ����������� ���� �������� ���������� ��� ���������."
 
-#: composer/e-msg-composer.c:528
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "��������� �������"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
-msgstr ""
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "�������� �������� ���������"
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: composer/e-msg-composer.c:908
-#, fuzzy
-msgid "Open file"
-msgstr "������� ��������"
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr ""
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "�������� �������� ���������"
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
+#: composer/e-msg-composer.c:1351
+#, fuzzy
+msgid "Open file"
+msgstr "������� ��������"
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
@@ -4889,315 +5831,137 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "��������"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "���������� ��� �������..."
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_���� ��������"
-
-#: executive-summary/component/e-summary.c:924
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#: executive-summary/component/e-summary.c:938
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "�������� �������� ���������"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "��������"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "���������"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "���������"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-#, fuzzy
-msgid "days"
-msgstr "��������"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "��������"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr "��������"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: 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"
@@ -5205,28 +5969,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5236,11 +6008,11 @@ msgid "Filter Rules"
 msgstr "_��������"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 #, fuzzy
 msgid "Add action"
 msgstr "�_��������"
@@ -5251,28 +6023,28 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "_���� ��������"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5285,27 +6057,46 @@ msgstr "����������� ������"
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 #, fuzzy
 msgid "Execute actions"
 msgstr "�_��������"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 #, fuzzy
 msgid "Edit Filters"
@@ -5350,397 +6141,536 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Attachments"
 msgstr "��� ���������"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "�_��������"
+
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "���������� ��� �������..."
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Expression"
 msgstr "�_��������"
 
-#: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Forward to Address"
-msgstr "�������� �������� ���������"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "������_��"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "Is"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Message Body"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Message was sent"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "���������� ��� �������..."
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: 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:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "��������� ��������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "�������"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "����� ���������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "contains"
-msgstr "�_��������"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
-msgstr ""
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "_������"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
-msgstr ""
+#: filter/rule-editor.c:240
+#, fuzzy
+msgid "Add Rule"
+msgstr "��� ����������"
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
-msgstr ""
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "_��������"
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
-msgstr ""
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "_��������"
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
-msgstr ""
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "_������"
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr ""
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "_������"
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
-msgstr ""
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "���� ��� ��� �� ���������������"
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "�_��������"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "��������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
 msgstr ""
 
-#: filter/score-editor.c:130
+#: mail/component-factory.c:337
 #, fuzzy
-msgid "Score Rules"
-msgstr "_��������"
+msgid "Properties..."
+msgstr "���������"
 
-#: mail/component-factory.c:329
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "���������"
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "_���� ��������"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr ""
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "����"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1244
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "��������� ���������"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:1247
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on Mailing _List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr ""
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
+msgstr "����"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "����"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "��������� ���������"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
+msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "��������"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr ""
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "_Save As..."
+msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "_Print"
+msgstr "�������������"
+
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "���������� ��� �������..."
+
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "���������� ��� �������..."
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Move to Folder..."
+msgid "_Move to Folder..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:1304
 #, fuzzy
-msgid "Copy to Folder..."
+msgid "_Copy to Folder..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
 msgstr ""
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "���� ��� ��� �� ���������������"
+
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_��������"
 
-#: mail/folder-browser.c:613
+#: mail/folder-browser.c:1322
 #, fuzzy
-msgid "Create Rule From Message"
+msgid "Create Ru_le From Message"
 msgstr "�������� ��������"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "�������� ��� �������� ��������"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Factory to import mbox into Evolution"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "������������� ��� ���������� ������� Bonobo ����������"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
 
 #: mail/local-config.glade.h:1
 #, fuzzy
@@ -5778,40 +6708,66 @@ msgstr "�����������"
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: 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 ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "�_����� ������������ ��� Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "���� ��� ��� �� ���������������"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
-msgid "Are you sure you want to delete this news account?"
+#: mail/mail-accounts.c:268
+msgid "Don't delete"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: 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 OK button and title
-#: mail/mail-account-editor.c:173
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "�_����� ������������ ��� Evolution"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
+msgstr ""
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -5833,12 +6789,12 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "_��������"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5846,103 +6802,161 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "��������� ���������"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_��������"
+
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "����������� ��������"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5955,37 +6969,67 @@ msgid " color"
 msgstr ""
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "����� ���������"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "����� ���������"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "��� ���������"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "��� ����������"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5995,449 +7039,591 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "������_��"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "���������� ��� �������..."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "�������������"
+
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "����������� ������"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "��������"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "���"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "��� �����"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "_���"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "������_��"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "��������"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "��� ����������"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "���������"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Sources"
 msgstr "��� ����������"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "_��������"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Username:"
 msgstr "������_��"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "��������"
+
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-#, fuzzy
-msgid "Save Attachment"
-msgstr "��� ���������..."
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-display.c:295
-msgid "Save to Disk..."
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+#, fuzzy
+msgid "Save Attachment"
+msgstr "��� ���������..."
+
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
+#, fuzzy
+msgid "Loading message content"
+msgstr "����������� ��������"
+
+#: mail/mail-display.c:1404
 #, fuzzy
-msgid "Open link in browser"
+msgid "Open Link in Browser"
 msgstr "������� �� ��� ��������"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "_��������"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "���������� ��� �������..."
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_��������"
+msgid "Save Image as..."
+msgstr "���������� ��� �������..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "��������"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "��� ���������"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "����������� ��������"
+msgid "Date"
+msgstr "����������"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "���� ��� ��� �� ���������������"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "���"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "������"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "����"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "���������:"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "�������� ��� ���������"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_���� ��������"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-#, fuzzy
-msgid "Creating new folder"
-msgstr "���������� ��� �������..."
-
-#: mail/mail-local.c:908
-#, fuzzy
-msgid "Copying messages"
-msgstr "����������� ��������"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_���� ��������"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "�_����� ������������ ��� Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-#, fuzzy
-msgid "Sending message"
-msgstr "����������� ��������"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
@@ -6452,297 +7638,292 @@ msgstr "��� ��������"
 msgid "Copying messages to %s"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 #, fuzzy
 msgid "Copying"
 msgstr "���������"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "�������_����"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "_���� ��������"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "��� ��������"
 
-#: mail/mail-ops.c:1550
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1634
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "����������� ��������"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "��� ���������..."
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
-msgstr "����������"
+msgid "(Untitled Message)"
+msgstr "����������� ��������"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "����������� ��������"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "�������� ��� ���������"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "�������� ��� ���������"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+msgid "Search Forward"
+msgstr ""
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "�������������"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "����������"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 #, fuzzy
 msgid "Receiving"
 msgstr "������"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr ""
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
+msgstr "�_��������"
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr ""
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
+msgstr "�_��������"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "��������"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "�������� �������� ���������"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "�������� �������� ���������"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "_��������"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "_���� ��������"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr ""
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-#, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "�������� ��� ��������� ��� ���������"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-#, fuzzy
-msgid "Reply to all recipients of this message"
-msgstr "�������� ��� ��������� ��� ���������"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-#, fuzzy
-msgid "Forward this message"
-msgstr "�������� �������� ���������"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-#, fuzzy
-msgid "Print the selected message"
-msgstr "�������� ��� ��������� ��� ���������"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-#, fuzzy
-msgid "Delete this message"
-msgstr "�������� �������� ���������"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 #, fuzzy
 msgid "Seen"
 msgstr "��������"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "�������� ���� ���������"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "����������� ��������"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "From"
-msgstr "���"
+msgid "Updating message list"
+msgstr "����������� ��������"
 
-#: mail/message-list.c:1053
-#, fuzzy
-msgid "Date"
-msgstr "����������"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "������"
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr "����"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "�������"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_��������"
@@ -6772,161 +7953,1449 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Folder name:"
-msgstr "����������� ������"
+msgid "Factory for the Evolution executive summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/component-factory.c:140
 #, fuzzy
-msgid "Folder type:"
-msgstr "_��������"
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "���������� ��� ��������� ���� ����������� �������"
+msgid "Appointments"
+msgstr "�_�������"
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "�_�������"
+
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "��������"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "��� �����"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
 msgstr "�������� �������� ���������"
 
-#: shell/importer/importer.c:387
-#, fuzzy, c-format
-msgid "Error loading %s"
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "�������� �������_����"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "�_��������"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "�������������"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
+msgstr ""
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "����������"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "������_��"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "������_��"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "����������"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "��� ����������"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "���������"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "��� ����������"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "������_��"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "�������"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "_������"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "��������"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "��_���� ����������"
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Thick mist"
+msgstr "��������� ������������"
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "�������������"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
 msgstr "�������� �������� ���������"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
 msgstr ""
 
-#: shell/importer/importer.c:523
+#. SMOKE
+#: my-evolution/metar.c:111
 #, fuzzy
-msgid "Filename:"
-msgstr "����������� ������"
+msgid "Smoke"
+msgstr "��� ����������"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
 #, fuzzy
-msgid "Select a file"
-msgstr "�����_����� �����������"
+msgid "Shallow smoke"
+msgstr "�������� �������_����"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
 
-#: shell/importer/importer.c:538
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
 #, fuzzy
-msgid "File type:"
-msgstr "������ ������������"
+msgid "Smoke with wind"
+msgstr "�������� �������� ���������"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
 #, fuzzy
-msgid "Evolution Import Utility"
-msgstr "�_����� ������������ ��� Evolution"
+msgid "Sand"
+msgstr "��������"
 
-#: shell/importer/import.glade.h:3
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
 #, fuzzy
-msgid "Evolution Importer Utility"
-msgstr "�_����� ������������ ��� Evolution"
+msgid "Haze"
+msgstr "��������"
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "��������"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "��� �����"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "_��������"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "�_��������"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "���������� ��� �������..."
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "�������������"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "��� ����������"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "���������"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "_��������"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "�������� �������_����"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "�������� �������_����"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "�������_����"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "����������"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "����������"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr ""
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "�������� �������_����"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "_��������"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6934,14 +9403,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6949,7 +9418,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6957,535 +9435,905 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "���������� ��� �������..."
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "���������� ��� �������..."
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "�������� �������� ���������"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:319
+#: shell/e-shell-folder-selection-dialog.c:343
 #, fuzzy
 msgid "New..."
 msgstr "_���"
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "�������� �������� ���������"
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "�������� �������� ���������"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "����������� ������"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "�����_����� �����������"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "������ ������������"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "_���� ��������"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "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:374
+#: shell/e-shell-view-menu.c:437
 #, fuzzy
 msgid "Go to folder..."
 msgstr "���������� ��� �������..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "���������� ��� �������..."
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+msgid "Work Online"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "����������� �����������"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "�������� ��� ������ ������������"
+
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "����� ���������"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "������ ���������"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "��� �����"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
-msgid "_Remove This Group..."
+msgid "_Remove this Group..."
 msgstr "�������� ������"
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "�������� ������"
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "�������� ��� ������ ������������"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "�������� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr ""
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "����������� �����������"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "����_���"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "������� �� ��� ��������"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "�������� ��� ���������"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "����������� ������"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "����������� �����������"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "������ ������������"
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
+#: shell/e-shortcuts.c:982
 #, fuzzy
-msgid "_View"
-msgstr "_���"
+msgid "Shortcuts"
+msgstr "�������� ��� ������ ������������"
 
-#: shell/e-storage-set-view.c:649
+#: shell/e-shortcuts.c:984
 #, fuzzy
-msgid "View the selected folder"
-msgstr "�������� ��� ��������� ��� ���������"
+msgid "Inbox"
+msgstr "�����������"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_��������"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
 msgstr ""
 
-#: shell/main.c:83
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "������� ��� �������� ������������"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "����������� ������"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_��������"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "�������� �������� ���������"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
-msgstr ""
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
+msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "���������"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create new contact"
-msgstr "���������� ��� �������..."
+msgid "Copy the selection"
+msgstr "������� ���������� �����������"
 
 #: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "Delete a contact"
-msgstr "�������� ���������"
+msgid "Create new contact"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+#: ui/evolution-addressbook.xml.h:5
 #, fuzzy
-msgid "Find"
-msgstr "�������������"
+msgid "Create new contact list"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "����"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
-msgid "Find a contact"
-msgstr "� ��������� ��������� ���"
+msgid "Delete selected contacts"
+msgstr "�������� ���������"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "New contact"
 msgstr "_��������"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "New list"
+msgstr "_���"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "����������"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "���������� ������������ ��� �� ��������"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "�������� ��� ���������"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
-msgid "Print contacts"
+msgid "Print selected contacts"
 msgstr "� ��������� ��������� ���"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "_���� ��������"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "�������� ���������"
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Stop"
 msgstr "��� ����������"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
-#, fuzzy
-msgid "View All"
-msgstr "_���"
-
-#: ui/evolution-addressbook.xml.h:15
-#, fuzzy
-msgid "View all contacts"
-msgstr "�������� ���������"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "��� ����������"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "_Contact"
 msgstr "_��������"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_��������"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
 msgstr "�������������"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "_���� ��������"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "�_�������"
 
-#: ui/evolution-calendar.xml.h:1
-#, fuzzy
-msgid "5 Days"
-msgstr "��������"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "���������� ��� �������..."
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "���������� ��� �������..."
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new calendar"
+msgid "Create a new appointment"
 msgstr "���������� ��� �������..."
 
 #: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Day"
-msgstr "��������"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "������"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "������"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to a specific date"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to present time"
+msgid "Go to a specific date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-#, fuzzy
-msgid "Month"
-msgstr "���������"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Open Calendar"
-msgstr "����������"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr ""
+msgid "New Appointment"
+msgstr "�_�������"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "����������"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "�� ���������� ���"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-#, fuzzy
-msgid "Save As"
-msgstr "����������"
+#: ui/evolution-calendar.xml.h:22
+msgid "Publish Free/Busy Information"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Show 1 day"
 msgstr "�������� �������_����"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-#, fuzzy
-msgid "Today"
-msgstr "������"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "�_�������"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "�_��������"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "��������"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "���������"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_���"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr ""
+
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "_Open Calendar"
-msgstr "����������"
+msgid "Close this appointment"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-comp-editor.xml.h:5
 #, fuzzy
-msgid "_Save As..."
-msgstr "���������� ��� �������..."
+msgid "Delete this appointment"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "�������� ��� ���������"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "�������������"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#, fuzzy
+msgid "Print this item"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#, fuzzy
+msgid "Print..."
+msgstr "�������������"
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+#, fuzzy
+msgid "Save and Close"
+msgstr "����������"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "�_��������"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_File"
+msgstr "_��������"
+
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
 msgstr "�������� �������� ���������"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr ""
 
@@ -7499,31 +10347,13 @@ msgstr "������_��"
 msgid "Print En_velope..."
 msgstr "�������������"
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-#, fuzzy
-msgid "Print this item"
-msgstr "�������� �������� ���������"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-#, fuzzy
-msgid "Print..."
-msgstr "�������������"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "���������� ��� �������..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-#, fuzzy
-msgid "Save and Close"
-msgstr "����������"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -7541,1035 +10371,1041 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "_��������"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-#, fuzzy
-msgid "_File"
-msgstr "_��������"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "����������"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr ""
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
-msgid "Actio_ns"
-msgstr "�_��������"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-#, fuzzy
-msgid "Address _Book... (FIXME)"
-msgstr "���������� ��� �������..."
+msgid "Se_nd list to other..."
+msgstr "_��������"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "C_lear"
-msgstr "����������"
+msgid "Send _message to list..."
+msgstr "_��������"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-#, fuzzy
-msgid "C_ut"
-msgstr "����"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-#, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_������"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Clear"
+msgid "Forward as i_Calendar"
 msgstr "����������"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-#, fuzzy
-msgid "Clear the selection"
-msgstr "�������� ��� ��������� ��� ���������"
-
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 #, fuzzy
-msgid "Close this appointment"
+msgid "Forward this item via email"
 msgstr "�������� �������� ���������"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-#, fuzzy
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "���������� ��� �������..."
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "���������"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-#, fuzzy
-msgid "Copy the selection"
-msgstr "������� ���������� �����������"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "����"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "�������� �������� ���������"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "�_��������"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-mail-global.xml.h:2
 #, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "���������� ��� �������..."
+msgid "Cancel the current mail operation"
+msgstr "�������� ���� ��� �������� ������������"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#: ui/evolution-mail-global.xml.h:3
 #, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "���������� �����_������"
+msgid "Compose"
+msgstr "��� ����������"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "�������� ���� ���������"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:9
 #, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_��������"
+msgid "Forget _Passwords"
+msgstr "����������"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "����������"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "���������� ������������ ��� �� ��������"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "������"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "��� ������ � ��� ������������� ���������"
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "Print Pre_view"
-msgstr "�������� ��� ��������� ��� ���������"
+msgid "Virtual Folder _Editor..."
+msgstr "_��������"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "�������������"
+msgid "_Filters..."
+msgstr "_��������"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "Print Setup"
-msgstr "�������������"
+msgid "_Mail Message"
+msgstr "_������"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
-msgid "Save"
-msgstr "����������"
+msgid "_Mail Settings..."
+msgstr "�_��������"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the current file"
-msgstr "�������� ���� ��� �������� ������������"
+msgid "_Send / Receive"
+msgstr "������"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Select All"
-msgstr "_���� ��������"
+msgid "Cut selected messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
-msgid "Select everything"
-msgstr "_���� ��������"
+msgid "Hide S_elected Messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "����_�� ������������"
+msgid "Hide _Read Messages"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_��������"
+msgid "Mark all visible messages as read"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#: ui/evolution-mail-list.xml.h:13
 #, fuzzy
-msgid "_Copy"
-msgstr "���������"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr ""
+msgid "Paste message in the clipboard"
+msgstr "���������� ������������ ��� �� ��������"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
-msgid "_Help"
-msgstr "������_��"
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 #, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_��������"
+msgid "Select _All"
+msgstr "_���� ��������"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "���������� �����_������"
+msgid "Select _Thread"
+msgstr "�����_����� �����������"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-#, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "���������� ��� �������..."
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_������"
+msgid "Select all visible messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "���������� ��� �������..."
+msgid "Show _All"
+msgstr "����������� ��������"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_��������"
+msgid "Temporarily hide all messages that have already been read"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+#: ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Paste"
-msgstr "����������"
+msgid "Temporarily hide the selected messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-mail-list.xml.h:24
 #, fuzzy
-msgid "_Print"
-msgstr "�������������"
+msgid "Threaded Message list"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_��������"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "_Properties..."
 msgstr "���������"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-#, fuzzy
-msgid "_Select All"
-msgstr "_���� ��������"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
-msgid "_Task (FIXME)"
-msgstr "����_�� ������������"
+msgid "_Threaded Message List"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_��������"
+msgid "Apply filter rules to the selected messages"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "��� ����������"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "���������� ��� �������..."
+msgid "Compose a reply to the sender of the selected message"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-executive-summary.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
-msgid "Executive Summary Settings..."
-msgstr "��������"
+msgid "Copy selected messages to another folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: ui/evolution-executive-summary.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
-msgid "New Mail"
-msgstr "_������"
+msgid "Create _Virtual Folder From Message"
+msgstr "�������� ��������"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-#, fuzzy
-msgid "Compose"
-msgstr "��� ����������"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-#, fuzzy
-msgid "Compose a new message"
-msgstr "�������� ���� ���������"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "���������� ��� �������..."
+msgid "Create a virtual folder for these recipients"
+msgstr "�������� ��������"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "���������� ��� ��������� ���� ����������� �������"
+msgid "Create a virtual folder for this mailing list"
+msgstr "�������� ��������"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "���������� ��� ��������� ���� ����������� �������"
+msgid "Create a virtual folder for this sender"
+msgstr "�������� ��������"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this subject"
 msgstr "�������� ��������"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
-msgid "Delete the selected messages"
+msgid "Display the next important message"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Edit Message"
-msgstr "�������� ��� ���������"
+msgid "Display the next message"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
-msgid "Edit the current message"
+msgid "Display the next unread message"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Display the previous unread message"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "�������� ��� �������� ��������"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "����"
+
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "��������� ���������"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "����"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-#, fuzzy
-msgid "Forget _Passwords"
-msgstr "����������"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Forward As"
 msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Full _Headers"
-msgstr "����������� ������"
+msgid "Forward _Quoted"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Hide Deleted Messages"
+msgid "Forward the selected message in the body of a new message"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
-msgid "Hide S_elected Messages"
+msgid "Forward the selected message quoted like a reply"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-msgid "Hide _Deleted Messages"
+msgid "Forward the selected message to someone"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Hide _Read messages"
+msgid "Load _Images"
 msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected messages as unimportant"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark the selected messages as not having been read"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Move"
 msgstr "_������"
 
-#: ui/evolution-mail.xml.h:45
-#, fuzzy
-msgid "Move message to a new folder"
-msgstr "���������� ��� ��������� ���� ����������� �������"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: ui/evolution-mail.xml.h:47
-#, fuzzy
-msgid "Open in New Window"
-msgstr "������� �� ��� ��������"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-msgid "Open the current message in a new window"
-msgstr "�������� ��� ���������"
+msgid "Next Important Message"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "�������� ��� ��������� ��� ���������"
+msgid "Next Message"
+msgstr "��������� ���������"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "�����_����� �����������"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Print message..."
+msgid "Next Unread Message"
 msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "�������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "�������� ��� ��������� ��� ���������"
+
+#: ui/evolution-mail-message.xml.h:58
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "�������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to all"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Reply to sender"
-msgstr "���������� ��� �������..."
+msgid "Previous Important Message"
+msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "S_ource"
-msgstr "��� ����������"
+msgid "Previous Message"
+msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "���������� ��� ��������� ���� ����������� �������"
+msgid "Previous Unread Message"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Select _All"
-msgstr "_���� ��������"
+msgid "Print Message..."
+msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Select _Thread"
-msgstr "�����_����� �����������"
+msgid "Print Preview..."
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Send / Receive"
-msgstr "������"
+msgid "Print this message"
+msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "����������� ��������"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Show Email _Source"
+msgstr "������ ������������"
+
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "����������� ������"
+
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Show _All"
-msgstr "����������� ��������"
+msgid "Show message with all email headers"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "�������� �������� ���������"
+msgid "Show the raw email source of the message"
+msgstr "��������� ������� ��� ������"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
-msgid "VFolder on _Recipients"
-msgstr "��������� ���������"
+msgid "VFolder on Mailing _List..."
+msgstr "�������� ��� �������� ��������"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on Se_nder..."
 msgstr "����"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "��������� ���������"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "_��������"
+msgid "VFolder on _Subject..."
+msgstr "����"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "_��������"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "��� ���������"
-
-#: ui/evolution-mail.xml.h:89
-#, fuzzy
-msgid "_Copy to Folder..."
+msgid "_Copy to Folder"
 msgstr "���������� ��� �������..."
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "�������� ��������"
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_��������"
-
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_��������"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:98
-#, fuzzy
-msgid "_Mail Message"
-msgstr "_������"
+msgid "_Forward Message"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Mail Settings..."
-msgstr "�_��������"
+msgid "_Message Display"
+msgstr "��������� ���������"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Move to Folder..."
+msgid "_Move to Folder"
 msgstr "���������� ��� �������..."
 
-#: ui/evolution-mail.xml.h:101
-#, fuzzy
-msgid "_Open Selected Items"
-msgstr "�������� ��� ��������� ��� ���������"
-
-#: ui/evolution-mail.xml.h:103
-msgid "_Quoted"
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Reply"
-msgstr "������"
+msgid "_Open Message"
+msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Resend Messages"
+msgid "_Re-send Message"
 msgstr "����������� ��������"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "���������� ��� �������..."
+msgid "Close this window"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-mail.xml.h:108
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "������"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#, fuzzy
+msgid "_View"
+msgstr "_���"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "���������"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
 msgid "Close the current file"
 msgstr "�������� ���� ��� �������� ������������"
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
+msgid "Delete all but signature"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-message-composer.xml.h:6
+#, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "�������� ��� ���������"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 #, fuzzy
 msgid "F_ormat"
 msgstr "���"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "��������� ������� ��� ������"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "������� ��������"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-#, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "���������� ��� �������..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+#, fuzzy
+msgid "Save"
+msgstr "����������"
+
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "����������"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "���������� ��� �������..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "Save the current file"
+msgstr "�������� ���� ��� �������� ������������"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "�������� ��� ���������"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send the message now"
-msgstr "�������� ��� ���������"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "�������� �������� ���������"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "��������/�������� �����������"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "�������� �������_����"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "�������� �������_����"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "�������� �������� ���������"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "��� ���������"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+#, fuzzy
+msgid "_Delete all"
+msgstr "_���� ��������"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-#, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "���������� ��� �������..."
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
 msgstr "����_���"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "������_��"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 #, fuzzy
 msgid "F_older"
 msgstr "_��������"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 #, fuzzy
 msgid "Subscribe"
 msgstr "��� ����������"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-#, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_��������"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-#, fuzzy
-msgid "Meeting Re_quest (FIXME)"
-msgstr "����_�� ������������"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-#, fuzzy
-msgid "Redo"
-msgstr "��������"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "������� ���������� �����������"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "Replace"
-msgstr "������"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Replace a string"
-msgstr "������"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr ""
+msgid "Cancel Task"
+msgstr "�������_����"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_��������"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr ""
+msgid "Delegate Task"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "�������"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-#, fuzzy
-msgid "Undo the last action"
-msgstr "������� ���������� �����������"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "�_�������"
+msgid "Copy selected task"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "_������"
+msgid "Create a new task"
+msgstr "���������� ��� �������..."
 
-#: ui/evolution-task-editor-dialog.xml.h:84
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-msgid "_Reply (FIXME)"
-msgstr "����_�� ������������"
+msgid "Cut selected task"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "Create a new task"
-msgstr "���������� ��� �������..."
+msgid "Delete selected tasks"
+msgstr "�������� �������� ���������"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "�������_����"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "���������� ������������ ��� �� ��������"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr ""
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "�_��������"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "�������_����"
@@ -8578,274 +11414,485 @@ msgstr "�������_����"
 msgid "About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:2
 #, fuzzy
-msgid "Close this window"
-msgstr "�������� �������� ���������"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+msgid "Add to _Shortcut Bar"
+msgstr "�������� ��� ������ ������������"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr ""
+#, fuzzy
+msgid "Copy this folder"
+msgstr "���������� ��� �������..."
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "���������� ��� �������..."
+
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "���������� ��� �������..."
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "�������� �������� ���������"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: ui/evolution.xml.h:17
 #, fuzzy
-msgid "Evolution bar _shortcut"
+msgid "Evolution _Window"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 #, fuzzy
 msgid "Getting _Started"
 msgstr "��_���� ����������"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr ""
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "������� �� ��� ��������"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "�������� ��� ���������"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "_������"
+
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "�������� ��� ������ ������������"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "�������� ��� ������ ������������"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "�� URI ��� �� ��������� � ����������� ��������"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Using the _Calendar"
 msgstr "����������"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr ""
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "View the selected folder"
+msgstr "�������� ��� ��������� ��� ���������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "�_��������"
+#: ui/evolution.xml.h:41
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "�_�������"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_��������"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "���������"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_��������"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "���������� ��� �������..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import file..."
 msgstr "���������"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "_������"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "_������"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_���"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "_���� ��������"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "����_���"
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "�������� ��� ������ ������������"
+
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "�������� ��� ������ ������������"
 
+#: ui/evolution.xml.h:61
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "����_�� ������������"
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "�_��������"
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "��� ����������"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "���������"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "��������"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "��������� ��������"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "����"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "��������� ���������"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 #, fuzzy
 msgid "_Options"
 msgstr "�_��������"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "��_���� ����������"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #, fuzzy
 msgid "Meeting _end time:"
 msgstr "��_���� ����������"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
 msgid "Now"
 msgstr "_���"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#, fuzzy
+msgid "Today"
+msgstr "������"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "�������_����"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "�_��������"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "_���"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "����_���"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "_��������"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "�� ���������� ���"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "��������� ��� �������������"
 
-#: widgets/misc/e-filter-bar.c:317
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
-msgid "Advanced ..."
+msgid "Advanced..."
 msgstr "��������� ��� �������������"
 
 #: widgets/misc/e-messagebox.c:152
@@ -8856,6 +11903,10 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr ""
@@ -8871,47 +11922,10 @@ msgstr "��������� ���������"
 msgid "Don't show this message again."
 msgstr "�������� �������� ���������"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr ""
-
-#: views/addressbook/galview.xml.h:2
-#, fuzzy
-msgid "By Company"
-msgstr "���������"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
-
-#: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "By Sender"
-msgstr "��������"
-
-#: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By Status"
-msgstr "��������� ��������"
-
-#: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Subject"
-msgstr "����"
-
-#: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "Messages"
-msgstr "��������� ���������"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr ""
-
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8937,16 +11951,349 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #, fuzzy
-#~ msgid "New"
-#~ msgstr "_���"
+#~ msgid "TasksPreferences"
+#~ msgstr "����������"
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgid "C_ontacts..."
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "_Company:"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Find..."
+#~ msgstr "�������������"
+
+#, fuzzy
+#~ msgid "Open calendar"
+#~ msgstr "�� ���������� ���"
+
+#, fuzzy
+#~ msgid "Save calendar"
+#~ msgstr "�� ���������� ���"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "�������_����"
+
+#, fuzzy
+#~ msgid "Visual Alarms"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "Edit the task"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
 #, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
+#~ msgid "Add to Calendar"
+#~ msgstr "�� ���������� ���"
+
+#, fuzzy
+#~ msgid "Update Calendar"
+#~ msgstr "����������"
+
+#, fuzzy
+#~ msgid "Appointment Basics"
+#~ msgstr "�_�������"
+
+#, fuzzy
+#~ msgid "_Starting date:"
+#~ msgstr "��_���� ����������"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "�������� ��� ��������� ��� ���������"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "��� ���������"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "�_��������"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
+
+#, fuzzy
+#~ msgid "Forward to Address"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "������_��"
+
+#, fuzzy
+#~ msgid "Move to Folder..."
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Copy to Folder..."
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Copying messages"
+#~ msgstr "����������� ��������"
+
+#, fuzzy
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Print the selected message"
+#~ msgstr "�������� ��� ��������� ��� ���������"
+
+#, fuzzy
+#~ msgid "Delete this message"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Find a contact"
+#~ msgstr "� ��������� ��������� ���"
+
+#, fuzzy
+#~ msgid "View All"
+#~ msgstr "_���"
+
+#, fuzzy
+#~ msgid "View all contacts"
+#~ msgstr "�������� ���������"
+
+#, fuzzy
+#~ msgid "5 Days"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Create a new calendar"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "����������"
+
+#, fuzzy
+#~ msgid "_Open Calendar"
+#~ msgstr "����������"
+
+#, fuzzy
+#~ msgid "Actio_ns"
+#~ msgstr "�_��������"
+
+#, fuzzy
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "����������"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_������"
+
+#, fuzzy
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "���������� �����_������"
+
+#, fuzzy
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "�������������"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "_���� ��������"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "����_�� ������������"
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "���������� �����_������"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_������"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "��� ����������"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "New Mail"
+#~ msgstr "_������"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Copy message to a new folder"
+#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "�������� ��� ��������� ��� ���������"
+
+#, fuzzy
+#~ msgid "Move message to a new folder"
+#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "�������� ��� ��������� ��� ���������"
+
+#, fuzzy
+#~ msgid "S_ource"
+#~ msgstr "��� ����������"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "�������� ��� ���������"
+
+#, fuzzy
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "���������� ��� �������..."
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "����_�� ������������"
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "������� ���������� �����������"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "Replace a string"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_��������"
+
+#~ msgid "Undo"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Undo the last action"
+#~ msgstr "������� ���������� �����������"
+
+#, fuzzy
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "����_�� ������������"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "�_����� ������������ ��� Evolution"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "��������� ��� �������������"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
 #, fuzzy
 #~ msgid ""
@@ -8965,10 +12312,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "�_����� ������������ ��� Evolution"
 
 #, fuzzy
-#~ msgid "Open..."
-#~ msgstr "����_���"
-
-#, fuzzy
 #~ msgid "Enter the identity you wish to send this message from"
 #~ msgstr "�������� ��� ��������� ��� ���������"
 
@@ -8976,10 +12319,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "�������� �� ���� ��� ���������"
 
 #, fuzzy
-#~ msgid "Saving changes to message..."
-#~ msgstr "�������� ��� ���������"
-
-#, fuzzy
 #~ msgid "Save changes to message..."
 #~ msgstr "�������� ��� ���������"
 
@@ -8988,18 +12327,10 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "Remove action"
-#~ msgstr "�������� ������"
-
-#, fuzzy
 #~ msgid "Remove criterion"
 #~ msgstr "�������� ������"
 
 #, fuzzy
-#~ msgid "Add Rule"
-#~ msgstr "��� ����������"
-
-#, fuzzy
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "_��������"
 
@@ -9088,30 +12419,10 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "_��������"
 
 #, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "_������"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "�_��������"
-
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "��� �����"
-
-#, fuzzy
 #~ msgid "Mail Sources"
 #~ msgstr "������ ������������"
 
 #, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "��� ����������"
-
-#, fuzzy
 #~ msgid "_Print Contacts..."
 #~ msgstr "� ��������� ��������� ���"
 
@@ -9172,10 +12483,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "������"
 
 #, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "������ ������������"
-
-#, fuzzy
 #~ msgid "Forward message \"%s\""
 #~ msgstr "�������� �������� ���������"
 
@@ -9207,10 +12514,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgid "Second"
 #~ msgstr "��������"
 
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "���������"
-
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "���� ����������� ������������ ��� ��������"
 
@@ -9232,10 +12535,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgid "Bcc: >>"
 #~ msgstr "����� ���������:"
 
-#, fuzzy
-#~ msgid "Discard this message?"
-#~ msgstr "�������� �������� ���������"
-
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "���� ����������� �������� ��� ��������"
 
@@ -9245,9 +12544,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "���������� ����������� �������� ��� �� ��������"
 
-#~ msgid "Evolution can not create its local folders"
-#~ msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
-
 #~ msgid "Composes a new mail message"
 #~ msgstr "�������� ���� ���������"
 
@@ -9263,9 +12559,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr ""
 #~ "��� ����������, � ������������ ��� ���������� �������� ��� Evolution �������."
 
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "��� ������ � ��� ������������� ���������"
-
 #~ msgid "Clos_e All Items"
 #~ msgstr "��_������ ����"
 
@@ -9313,12 +12606,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgid "A service containing tasks"
 #~ msgstr "�������� ��� �������� ������������"
 
-#~ msgid "Rename Shortcut"
-#~ msgstr "����������� �����������"
-
-#~ msgid "Tasks list"
-#~ msgstr "��������� ������������"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "������������ ������� ����������� ��������������"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index bb5c3d412b..a31ce1a565 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-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,25 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +253,10 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
@@ -260,14 +269,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -276,716 +285,828 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-msgid "General"
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-msgid "This contact belongs to these categories:"
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-msgid "Assistant"
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
-msgid "Business"
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-msgid "Business 2"
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
-msgid "Business Fax"
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-msgid "Callback"
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
-msgid "Car"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-msgid "Company"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
-msgid "Home"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-msgid "Home 2"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
-msgid "Home Fax"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
-msgid "ISDN"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-msgid "Mobile"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
-msgid "Other"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
-msgid "Other Fax"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
-msgid "Pager"
+#: addressbook/gui/component/addressbook.c:380
+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/contact-editor/e-contact-editor.c:1257
-msgid "Primary"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
-msgid "Radio"
+#: addressbook/gui/component/addressbook.c:393
+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/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
-msgid "Telex"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
-msgid "TTY/TDD"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
-msgid "Contact Quick-Add"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
-msgid "Edit Full"
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
-msgid "Full Name"
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
-msgid "E-mail"
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Post Code:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+msgid "Unnamed Contact"
+msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+msgid "Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+msgid "Car"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+msgid "Company"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+msgid "Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
+msgid "Other"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+msgid "Primary"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
+msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
+msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Post Code:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Cannot initialise Evolution's mail component."
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Cannot initialise Evolution's mail component."
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr ""
+
+#: 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?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1097,157 +1218,238 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+msgid "Error modifying card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+msgid "Done."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1285,7 +1487,7 @@ msgid "Dimensions:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+msgid "F_ont..."
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1345,7 +1547,6 @@ msgid "Margins"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr ""
 
@@ -1426,140 +1627,317 @@ msgstr ""
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Colours"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "_Edit appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:402
+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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1567,160 +1945,294 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Could not initialise Bonobo"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-#, fuzzy
-msgid "Close"
-msgstr "Colours"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:301
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, c-format
+msgid "%d seconds"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:306
+msgid "1 second"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+msgid "before start of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:364
+msgid "after start of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:374
+msgid "before end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:377
+msgid "after end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "_Options..."
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
@@ -1752,36 +2264,38 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
+msgid "Calendar Preferences"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr ""
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colours"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1789,1013 +2303,1099 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
+msgid "End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+msgid "First day of week:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
+msgid "Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
-msgid "Friday"
+msgid "Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
+msgid "Remind me of all appointments"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
+msgid "Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
-msgid "Monday"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+msgid "Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Pick a colour"
+msgid "Start of day:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
+msgid "Sun"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
+msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
+msgid "Tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
-msgid "Saturday"
+msgid "Thu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+msgid "Time"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
+msgid "Time zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
-msgid "Sunday"
+msgid "Tue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
+msgid "Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
-msgid "Thursday"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
-msgid "Tuesday"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
-msgid "Wednesday"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Appointment - %s"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Task - %s"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "Journal entry - %s"
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+msgid "Delegated"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
 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:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/dialogs/meeting-page.c:1442
+msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-#, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
-msgid "Date:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
-msgid "Organizer:"
-msgstr "Organisation:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
-msgid "Server Message:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated From:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Organisation:"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "40%"
 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/e-week-view-main-item.c:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-calendar-table.c:861
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.c:863
+msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-calendar-table.c:868
+msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-msgid "Send an email"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
+#: calendar/gui/e-calendar-table.etspec.h:15
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(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:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
+#. 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:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3306
+msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
-msgid "on the"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+msgid "The message is not understandable."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d seconds"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-msgid " before start of appointment"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1605
-msgid " after start of appointment"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1613
-msgid " before end of appointment"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1615
-msgid " after end of appointment"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/gnome-cal.c:700
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2821,236 +3421,251 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
+msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
+msgid "_Go To Today"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+msgid "Print Item"
+msgstr ""
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr ""
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3086,82 +3701,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr ""
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3193,14 +3828,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3215,113 +3869,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr ""
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3340,37 +3989,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3467,78 +4116,147 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
-msgid "Trash"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+msgid "Failed to decode message."
+msgstr ""
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
 
 #: camel/camel-url.c:289
@@ -3546,65 +4264,87 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
-#, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Synchronising \"%s\""
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+msgid "Scanning for changed messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+msgid "Scanning for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3612,7 +4352,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr ""
 
@@ -3644,28 +4384,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3673,116 +4413,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
+msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3790,14 +4539,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3805,28 +4554,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+
+#: 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 ""
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3836,20 +4598,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3888,83 +4655,100 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -3974,39 +4758,97 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4019,24 +4861,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4045,21 +4887,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4077,7 +4929,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4105,53 +4957,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr ""
 
@@ -4203,7 +5060,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4211,122 +5068,122 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4334,318 +5191,356 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
+#: composer/e-msg-composer.c:1047
+#, c-format
+msgid "Error accessing file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1061
+#, c-format
 msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:908
-msgid "Open file"
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1076
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
@@ -4663,310 +5558,133 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Evolution component for the executive summary."
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Colours"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: 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"
@@ -4974,28 +5692,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5004,11 +5730,11 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr ""
 
@@ -5018,27 +5744,27 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5050,26 +5776,45 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -5110,370 +5855,488 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Attachments"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Copy to Folder"
+msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:6
-msgid "Date received"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "Date sent"
+#: filter/libfilter-i18n.h:8
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Deleted"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Exist"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Important"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Is Not"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Is"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Body"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Message was received"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Message was sent"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Move to Folder"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Read"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "Recipients"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Regex Match"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Replied to"
+msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
-msgid "Score"
+#: filter/libfilter-i18n.h:28
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Sender"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Set Status"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Source Account"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Specific header"
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Stop Processing"
+msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
-msgid "Subject"
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "contains"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "does not contain"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "does not end with"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
+#: 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
-msgid "does not sound like"
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "does not start with"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "ends with"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "exists"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "is greater than"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "is less than"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "is"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "on or after"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "sounds like"
+msgid "was after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "starts with"
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: filter/rule-editor.c:147
+msgid "Rules"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr ""
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
 msgstr ""
 
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr ""
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+msgid "Settings"
+msgstr ""
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: 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:691
+msgid "Pine mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr ""
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+msgid "Properties..."
+msgstr ""
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 msgstr ""
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
-msgid "Apply Filters"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:735
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:736
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1313
+msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+#: mail/folder-browser.c:1318
+msgid "Apply Filters"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:1322
+msgid "Create Ru_le From Message"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1482
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:1483
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Factory for the Evolution mail component."
+msgid "Factory to import mbox into Evolution"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5506,38 +6369,62 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: 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 ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr ""
+
+#: mail/mail-account-gui.c:971
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
-msgid "Are you sure you want to delete this news account?"
+#: mail/mail-accounts.c:268
+msgid "Don't delete"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: 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 OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -5560,11 +6447,11 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5572,99 +6459,155 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1463
+msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr ""
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5678,34 +6621,63 @@ msgid " color"
 msgstr "Colours"
 
 #: mail/mail-config.glade.h:3
-msgid "Account"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Management"
+msgid "Account Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5715,418 +6687,551 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr ""
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+msgid "Mailbox location"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+msgid "Mark messages as Read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+msgid "NNTP Server:"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+msgid "Quoted"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "Source Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:299
-msgid "View Inline"
+#: mail/mail-display.c:399
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:403
+msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1406
+msgid "Copy Link Location"
+msgstr ""
+
+#: mail/mail-display.c:1408
+msgid "Save Link as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:1410
+msgid "Save Image as..."
+msgstr ""
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "View Inline (via %s)"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-display.c:361
-msgid "Hide"
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
 msgstr ""
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-display.c:1104
-msgid "Save as (FIXME)"
+#: mail/mail-folder-cache.c:186
+#, c-format
+msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-display.c:1106
-msgid "Copy location (FIXME)"
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
-msgid "Loading message content"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr ""
+
+#: mail/mail-format.c:842
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr ""
+
+#: mail/mail-format.c:867
+msgid "Reply-To"
+msgstr ""
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr ""
+
+#: mail/mail-format.c:873
+msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
 #, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1802
-msgid "Malformed external-body part."
+#: mail/mail-format.c:2102
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
+#: mail/mail-format.c:2107
+msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr ""
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, c-format
+msgid "Reconfigure %s"
+msgstr ""
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr ""
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
@@ -6140,275 +7245,269 @@ msgstr ""
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr ""
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
-msgstr ""
-
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1722
 #, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, c-format
+msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-send-recv.c:233
-msgid "Send & Receive mail"
+#: mail/mail-search.c:235
+msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
-msgid "Receiving"
+#: mail/mail-search.c:239
+msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-search.c:284
+msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-send-recv.c:306
-msgid "Sending"
+#: mail/mail-search.c:315
+msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-send-recv.c:471
-msgid "Cancelled."
+#: mail/mail-search.c:332
+msgid "Find:"
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-search.c:335
+msgid "Matches:"
 msgstr ""
 
-#: mail/mail-tools.c:141
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
+#: mail/mail-send-recv.c:250
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
+#: mail/mail-send-recv.c:253
+msgid "Receiving"
 msgstr ""
 
-#: mail/mail-tools.c:215
-#, c-format
-msgid "Forwarded message - %s"
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
+#: mail/mail-send-recv.c:323
+msgid "Sending"
 msgstr ""
 
-#: mail/mail-vfolder.c:249
-msgid "VFolders"
+#: mail/mail-send-recv.c:488
+msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-vfolder.c:427
-msgid "New VFolder"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
+#: mail/mail-tools.c:173
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
+#: mail/mail-tools.c:241
+#, c-format
+msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
+#: mail/mail-tools.c:245
+msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
+#: mail/mail-tools.c:469
+msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
+#: mail/mail-vfolder.c:270
+msgid "VFolders"
 msgstr ""
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
+#: mail/mail-vfolder.c:463
+msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
-msgid "From"
+#: mail/message-list.c:2290
+msgid "Updating message list"
 msgstr ""
 
-#: mail/message-list.c:1053
-msgid "Date"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr ""
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr ""
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr ""
 
@@ -6436,153 +7535,1404 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
+#: my-evolution/e-summary-calendar.c:177
+msgid "No appointments"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-mail.c:104
+msgid "Mail summary"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-preferences.c:1408
+msgid "My Evolution Settings"
 msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/e-summary-tasks.c:206
+msgid "No tasks"
 msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
+#: my-evolution/e-summary-weather.c:643
+msgid "Regions"
 msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Could not initialise Bonobo"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+msgid "Snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Partial mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+msgid "Sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+msgid "Haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+msgid "Sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "All folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Display folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "Five days"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "One day"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One month"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "Show all tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "Tasks "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Weather"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr ""
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+msgid "Local Folders"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6590,14 +8940,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6605,7 +8955,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6613,482 +8972,819 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+msgid "Move folder"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:354
+#, c-format
+msgid "Delete folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr ""
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr ""
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr ""
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "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:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+msgid "Create a new shortcut"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+msgid "Work Online"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+msgid "Rename Shortcut Group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+msgid "Re_name this Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:336
+msgid "Rename this shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
+#: shell/e-shortcuts-view.c:461
+msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Cannot initialise the Evolution shell."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
+msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:10
+msgid "New contact"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+msgid "New list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
-msgid "Stop"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "Stop Loading"
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:14
-msgid "View All"
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:17
+msgid "Print selected contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:21
+msgid "Stop Loading"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+msgid "_Contact Group"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
-msgid "_Tools"
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
+msgid "Create a new appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to a specific date"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to present time"
+msgid "Go to a specific date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-msgid "Month"
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
+#: ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
+msgid "Print calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
-msgid "Prev"
+msgid "Print this Calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:22
-msgid "Previews the calendar to be printed"
+msgid "Publish Free/Busy Information"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
-msgid "Print calendar"
+msgid "Show 1 month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:29
+msgid "_Appointment..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:30
+msgid "_Calendar Settings..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "Show 1 week"
+msgid "_Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
+msgid "_Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "W_ork Week"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Colours"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Day"
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
-msgid "_Month"
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print S_etup"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+msgid "_Action"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:2
@@ -7096,6 +9792,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr ""
 
@@ -7107,27 +9804,12 @@ msgstr ""
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -7144,1221 +9826,1373 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+msgid "_Save"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
+#: ui/evolution-contact-list-editor.xml.h:2
+msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Send _message to list..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+msgid "Forward as i_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Compose"
+msgstr "Colours"
+
+#: ui/evolution-mail-global.xml.h:4
+msgid "Compose _New Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:3
+msgid "Copy selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Cut selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
+#: ui/evolution-mail-message.xml.h:2
+msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
+#: ui/evolution-mail-message.xml.h:4
+msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-#, fuzzy
-msgid "Compose"
-msgstr "Colours"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:22
+msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
+#: ui/evolution-mail-message.xml.h:25
+msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:25
-msgid "Forward As"
+#: ui/evolution-mail-message.xml.h:26
+msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
+#: ui/evolution-mail-message.xml.h:27
+msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:30
-msgid "Full _Headers"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
-msgid "Hide Deleted Messages"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:32
-msgid "Hide S_elected Messages"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:33
-msgid "Hide _Deleted Messages"
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward _Inline"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Read messages"
+#: ui/evolution-mail-message.xml.h:33
+msgid "Forward _Quoted"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
+#: ui/evolution-mail-message.xml.h:36
+msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark the selected messages as not having been read"
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
-msgid "Move"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:50
+msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Next Important Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
+#: ui/evolution-mail-message.xml.h:53
+msgid "Next Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
+#: ui/evolution-mail-message.xml.h:55
+msgid "Next Unread Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to all"
+#: ui/evolution-mail-message.xml.h:56
+msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:64
-msgid "Reply to sender"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:67
-msgid "Save the message into a new file"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
+#: ui/evolution-mail-message.xml.h:60
+msgid "Previous Important Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:70
-msgid "Select _Thread"
+#: ui/evolution-mail-message.xml.h:61
+msgid "Previous Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:71
-msgid "Send / Receive"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Print Message..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:65
+msgid "Print Preview..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:66
+msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
-msgid "Show _All"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid "Un-delete the selected messages"
+#: ui/evolution-mail-message.xml.h:72
+msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on _Subject"
+#: ui/evolution-mail-message.xml.h:75
+msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:86
-msgid "Virtual Folder _Editor..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:87
-msgid "_Apply Filters"
+#: ui/evolution-mail-message.xml.h:78
+msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:88
-msgid "_Attachment"
+#: ui/evolution-mail-message.xml.h:79
+msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:89
-msgid "_Copy to Folder..."
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Create Filter From Message"
+#: ui/evolution-mail-message.xml.h:81
+msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
+#: ui/evolution-mail-message.xml.h:82
+msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:93
-msgid "_Filters..."
+#: ui/evolution-mail-message.xml.h:83
+msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
+#: ui/evolution-mail-message.xml.h:85
+msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
+#: ui/evolution-mail-message.xml.h:88
+msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:98
-msgid "_Mail Message"
+#: ui/evolution-mail-message.xml.h:89
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Mail Settings..."
+#: ui/evolution-mail-message.xml.h:90
+msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Move to Folder..."
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:101
-msgid "_Open Selected Items"
+#: ui/evolution-mail-message.xml.h:92
+msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Quoted"
+#: ui/evolution-mail-message.xml.h:93
+msgid "_Re-send Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Reply"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Resend Messages"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Save Message As..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Send / Receive"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
+msgid "Delete all but signature"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
+msgid "Encrypt this message with PGP"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
+msgid "F_ormat"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
+msgid "Insert a file as text into the message"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:12
+msgid "Insert text file..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "Open a file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
+msgid "S/MIME Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
+msgid "Save _Draft"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:23
-msgid "Send"
+msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
+msgid "Save the current file with a different name"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
+msgid "Save the message in a specified folder"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
+msgid "Send"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
+msgid "Send _Later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
+msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
+msgid "Send the mail in HTML format"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
+msgid "Send the message later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
+msgid "Send this message now"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
+msgid "Show / hide attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the BCC field is displayed"
+msgid "Show _attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the CC field is displayed"
+msgid "Show attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the From chooser is displayed"
+msgid "Sign this message with your PGP key"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:38
+msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:39
-msgid "_Bcc Field"
+msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:40
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:42
+msgid "_Attachment..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr ""
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Delegate Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:8
+msgid "New Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
+#: ui/evolution-tasks.xml.h:9
+msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
+#: ui/evolution-tasks.xml.h:13
+msgid "Tasks Settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:19
+msgid "_Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
+#: ui/evolution.xml.h:1
+msgid "About Evolution..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
-msgid "New Task"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Synchronising \"%s\""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
+#: ui/evolution.xml.h:7
+msgid "Create _New Folder..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
-msgid "_Task"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#: ui/evolution.xml.h:9
+msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
+#: ui/evolution.xml.h:13
+msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:15
+msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
+#: ui/evolution.xml.h:17
+msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:8
-msgid "E_xit"
+#: ui/evolution.xml.h:18
+msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
+#: ui/evolution.xml.h:19
+msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:10
-msgid "Exit the program"
+#: ui/evolution.xml.h:20
+msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:11
-msgid "Getting _Started"
+#: ui/evolution.xml.h:22
+msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:12
-msgid "Import an external file format"
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:44
+msgid "_Copy..."
+msgstr ""
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+msgid "_Move..."
+msgstr ""
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr ""
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+msgid "_Rename..."
+msgstr ""
+
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr ""
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr ""
+
+#: views/addressbook/galview.xml.h:1
+msgid "Address Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr ""
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr ""
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr ""
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
-msgid "Now"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
-msgid "Save Search"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:237
-msgid "Advanced Search"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
-msgid "Message"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:148
-msgid "Sear_ch"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Organisation"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
 msgstr ""
 
-#: views/mail/galview.xml.h:2
-msgid "By Status"
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
 msgstr ""
 
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
+#: widgets/misc/e-charset-picker.c:277
+msgid "Other..."
 msgstr ""
 
-#: views/mail/galview.xml.h:4
-msgid "Messages"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
 msgstr ""
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:157
+msgid "Search Editor"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:173
+msgid "Save Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:241
+msgid "Advanced Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:180
+msgid "Message"
+msgstr ""
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+msgid "Don't show this message again."
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:155
+msgid "Sear_ch"
 msgstr ""
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
@@ -8384,13 +11218,36 @@ msgstr "Could not initialise Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
+#~ msgid "Colors"
+#~ msgstr "Colours"
+
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Could not initialise Bonobo"
+#~ msgid "Organizer: "
+#~ msgstr "Organisation:"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Colours"
+
+#, fuzzy
+#~ 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."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Cannot initialise Evolution's mail component."
 
 #~ msgid "Synchronize"
 #~ msgstr "Synchronise"
@@ -8434,8 +11291,5 @@ msgstr "Could not initialise Bonobo"
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synchronise \"%s\""
 
-#~ msgid "Colors for display"
-#~ msgstr "Colours for display"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Cannot initialise Evolution's mail storage hash."
diff --git a/po/es.po b/po/es.po
index cb0a3d5fd1..ee8731f798 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-07-10 20:31+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-01-23 16:58-04:00\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -22,11 +22,11 @@ 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.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "Direcci�n:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  Direcci�n postal: "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  C�digo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Etiqueta de env�o: "
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Localizaci�n geogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "Organizaci�n: "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -292,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -300,7 +300,7 @@ msgstr ""
 "\n"
 "Cadena �nica: "
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -308,11 +308,11 @@ msgstr ""
 "\n"
 "Llave p�blica: "
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "VCards M�ltiples"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -322,9 +322,9 @@ msgstr "VCard para %s"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
@@ -338,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
@@ -417,7 +417,7 @@ msgstr "Ninguno (modo an�nimo)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr "Clave"
 
@@ -449,13 +449,14 @@ msgstr "Asociar DN:"
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN Help text here"
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Recuerda esta contrase�a"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Host:"
 msgstr "Servidor:"
 
@@ -492,7 +493,7 @@ msgid "Advanced LDAP Options"
 msgstr "Opciones avanzadas de LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Ruta:"
 
@@ -504,15 +505,15 @@ msgstr "FIXME Path Help text here"
 msgid "Create path if it doesn't exist."
 msgstr "Crear ruta si no existe."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Editar agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "A�adir agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -520,62 +521,60 @@ msgstr ""
 "Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
 "informaci�n relevante acerca de ella."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:887
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nombre:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME Name help text here"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Descripci�n:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Description help text here"
 
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "A�adir"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
-msgid "Delete"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Name"
 msgstr "Nombre"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_A�adir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
+
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
@@ -618,7 +617,7 @@ 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:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
@@ -638,30 +637,21 @@ msgstr "La categr�a contiene"
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrar� el visor de carpetas"
 
-#.
-#. * 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
-msgid "(none)"
-msgstr "(nada)"
-
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "Correo electr�nico principal"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr "Correo electr�nico 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr "Correo electr�nico 3"
 
@@ -691,7 +681,7 @@ msgstr "Editar informaci�n de contacto"
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 msgid "Add to Contacts"
 msgstr "A�adir a Contactos"
 
@@ -716,10 +706,13 @@ 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:156
-#: addressbook/gui/component/select-names/e-select-names.c:613
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Quitar"
 
@@ -731,6 +724,15 @@ msgstr "Quitar Todas"
 msgid "Send HTML Mail?"
 msgstr "�Enviar correo en HTML?"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Contactos Modificados:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
 msgstr "Lista de destinatarios"
@@ -752,140 +754,139 @@ msgstr "_Categor�a:"
 msgid "_Search"
 msgstr "_Buscar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_rabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax del trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegor�as..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Archivar como:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nuevo tipo de tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizaci�n:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipos de tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Prefiere recibir el correo como _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Direcci�n de la p�gina web:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: mail/mail-config.glade.h:102
-msgid "_Add"
-msgstr "_A�adir"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Direcci�n..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nombre del _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Fecha de _nacimiento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compa��a:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1293 mail/mail-config.glade.h:103
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Puesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nombre del _manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_M�vil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Nick:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesi�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_C�nyuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Es_t� es la direcci�n de correo"
 
@@ -893,95 +894,95 @@ msgstr "Es_t� es la direcci�n de correo"
 msgid "Delete Contact?"
 msgstr "�Borrar contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto est� en estas categor�as:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Compa��a"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "M�vil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
@@ -994,7 +995,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -1148,7 +1149,7 @@ msgid "Add Anyway"
 msgstr "A�adir de todos modos"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un Contacto Duplicado"
 
@@ -1169,18 +1170,14 @@ msgstr ""
 "en esta carpeta.  �Quiere a�adirlo de todos modos?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "Cambiar de todos modos"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Contactos Modificados:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Contactos Conflictivos:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1188,8 +1185,13 @@ msgstr ""
 "La direcci�n o el nombre modificados de este contacto\n"
 "ya existen en esta carpeta.  �Quiere a�adirlo de todos modos?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Cambiar de todos modos"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1321,9 +1323,9 @@ msgstr "Enviar un mensaje al contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
@@ -1332,6 +1334,15 @@ msgstr "Imprimir"
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Borrar"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
 #: addressbook/gui/widgets/e-addressbook-util.c:68
 #: addressbook/gui/widgets/e-minicard.c:451
@@ -1343,7 +1354,7 @@ msgid "Success"
 msgstr "Exito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1351,7 +1362,7 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1392,131 +1403,131 @@ msgid "Error removing list"
 msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aqu� para a�adir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Correo electr�nico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Tel�fono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Tel�fono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Tel�fono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Tel�fono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Tel�fono de la compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Tel�fono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizaci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Direcci�n del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Direcci�n de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Tel�fono m�vil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Tel�fono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Tel�fono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Tel�fono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Otro tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Otra direcci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "T�tulo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesi�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "C�nyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Hecho."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Eliminando tarjetas..."
 
@@ -1567,7 +1578,8 @@ msgid "Dimensions:"
 msgstr "Dimensiones:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fuente..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1706,18 +1718,23 @@ msgstr "Tipo:"
 msgid "Width:"
 msgstr "Ancho:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Fuente..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaci�n ToDo de la pilot"
 
@@ -1753,6 +1770,11 @@ msgstr "Factor�a para el control de vista de calendario iTip"
 msgid "Factory for the sample Calendar control"
 msgstr "Factor�a para el control del Calendario de ejemplo"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Factor�a para el componente de calendario de Evolution."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Servicio de notificaci�n de alarmas"
@@ -1761,103 +1783,85 @@ msgstr "Servicio de notificaci�n de alarmas"
 msgid "Factory for the alarm notification service"
 msgstr "Factoria para la alarma del servicio denotificaci�n"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Notificaci�n sobre su cita que comienza a las %s y acaba a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Notificaci�n sobre su cita que comienza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Notificaci�n sobre su cita que finaliza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Notificaci�n sobre su cita"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Notificaci�n sobre su tarea que comienza a las %s y acaba a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Notificaci�n sobre su tarea que comienza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Notificaci�n sobre su tarea que finaliza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Notificaci�n sobre su tarea"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, fuzzy, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-#, fuzzy
-msgid "Notification about your journal entry"
-msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma en %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "No hay un sumario disponible."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.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:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Cerrar"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Cerrar"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editas una cita"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
+#, fuzzy
+msgid "Snoo_ze"
 msgstr "Recordatorio"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Tiempo de recordatorio (minutos)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editas una cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "No hay un sumario disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr "Recordatorio de su cita a las "
 
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Recordatorio"
+
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
@@ -1882,126 +1886,149 @@ msgstr "No se puede inicializar gnome-vfs"
 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:278
-msgid "File not found"
-msgstr "Archivo no encontrado"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A %d de %B"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:302
-msgid "Open calendar"
-msgstr "Abrir calendario"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
-msgid "Save calendar"
-msgstr "Guardar calendario"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:596
+#: calendar/gui/calendar-commands.c:586
 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:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baja"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:873 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2012,27 +2039,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "La clasificaci�n debe ser 'P�blica', 'Privada', 'Confidencial' o 'Ninguna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258
-#: calendar/gui/dialogs/e-timezone-dialog.c:197
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:425 calendar/gui/e-calendar-table.c:500
-#: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
-#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
-#: shell/e-shell-view.c:1402 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
-#: widgets/misc/e-dateedit.c:1484
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2042,38 +2070,42 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "La transparencia debe ser 'Transparente', 'Opaca' o 'Ninguna'."
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "No"
 
@@ -2145,7 +2177,7 @@ msgstr "Ejecutar programa:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
 msgstr "d�as"
 
@@ -2153,11 +2185,11 @@ msgstr "d�as"
 msgid "extra times every"
 msgstr "extra tiempo cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutos"
 
@@ -2207,78 +2239,81 @@ msgid "1 second"
 msgstr "1 segundo"
 
 #: calendar/gui/dialogs/alarm-page.c:331
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
 #: calendar/gui/dialogs/alarm-page.c:335
-msgid "Show a dialog"
-msgstr "Mostrar un di�logo"
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Mostrar un mensaje"
 
 #: calendar/gui/dialogs/alarm-page.c:339
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Enviar un correo"
 
 #: calendar/gui/dialogs/alarm-page.c:343
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
 #: calendar/gui/dialogs/alarm-page.c:361
-msgid " before start of appointment"
+#, fuzzy
+msgid "before start of appointment"
 msgstr "antes del inicio de la cita"
 
 #: calendar/gui/dialogs/alarm-page.c:364
-msgid " after start of appointment"
+#, fuzzy
+msgid "after start of appointment"
 msgstr "tras el inicio de la cita"
 
 #: calendar/gui/dialogs/alarm-page.c:374
-msgid " before end of appointment"
+#, fuzzy
+msgid "before end of appointment"
 msgstr "antes del fin de la cita"
 
 #: calendar/gui/dialogs/alarm-page.c:377
-msgid " after end of appointment"
+#, fuzzy
+msgid "after end of appointment"
 msgstr "tras el fin de la cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Bases"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Display a message"
-msgstr "Mostrar un mensaje"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Options..."
-msgstr "Opci�nes..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Opci�nes..."
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "despu�s de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "antes"
 
@@ -2295,7 +2330,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2336,8 +2371,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Pitar cuando aparezca la ventana de la alarma."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1014
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -2370,7 +2404,7 @@ msgid "Defaults"
 msgstr "Valores predeterminados"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Mostrar"
 
@@ -2387,7 +2421,7 @@ msgid "Fri"
 msgstr "Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Viernes"
 
@@ -2396,7 +2430,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Lunes"
 
@@ -2417,7 +2451,7 @@ msgid "Sat"
 msgstr "Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -2439,7 +2473,7 @@ msgid "Sun"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -2456,7 +2490,7 @@ msgid "Thu"
 msgstr "Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -2481,7 +2515,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -2490,7 +2524,7 @@ msgid "Wed"
 msgstr "Mier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mi�rcoles"
 
@@ -2564,60 +2598,60 @@ 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:155
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:159
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:161
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:166
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:168
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:448
+#: calendar/gui/dialogs/comp-editor.c:449
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:453
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:456
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:474
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:805 mail/mail-callbacks.c:1462
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:809 mail/mail-callbacks.c:1466
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2626,12 +2660,12 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "�Sobreescribirlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:872 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1025
+#: calendar/gui/dialogs/comp-editor.c:1026
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
@@ -2695,8 +2729,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Use el bot�n izquierdo del rat�n para hacer zoom en un area del mapa y"
-"seleccionar una zona horaria.\n"
+"Use el bot�n izquierdo del rat�n para hacer zoom en un area del mapa "
+"yseleccionar una zona horaria.\n"
 " Use el bot�n derecho del rat�n para salir del zoom."
 
 #: calendar/gui/dialogs/event-editor.c:154
@@ -2722,7 +2756,7 @@ msgstr "Evento para todo e_l d�a"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificaci�n"
 
@@ -2751,11 +2785,6 @@ msgstr "Resu_men:"
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "Hora de _fin:"
@@ -2764,89 +2793,273 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nombre del grupo:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Fuente"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Coche"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Informaci�n Requerida"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Informaci�n Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Elija un archivo"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Borrado"
+
 #: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Borrado"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En proceso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Tel�fono del coche"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Informaci�n Requerida"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Informaci�n Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Enviado Por:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "Change Organizer"
-msgstr "Cambiar Organizador"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Delegado A:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Invite Others"
-msgstr "Invitar a Otros"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Todos los participantes"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Delegado Por:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Delegado A:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Encargado"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Miembros"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Reglas"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 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 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Cambiar Organizador"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Invitar a Otros"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Other Organizer"
+#, fuzzy
+msgid "_Other Organizer"
 msgstr "Otro Organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1110
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1118
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1288
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Recurrencia personalizada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Cada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Sin recurrencia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Regla de recurrencia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Recurrencia simple"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "para"
@@ -2904,7 +3117,7 @@ msgid "No one"
 msgstr "Ninguno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:895
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2937,155 +3150,168 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "Categor�as"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Fecha de vencimiento"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Fecha fin"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Fecha de Inicio"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Fecha de plazo"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "Posici�n geogr�fica"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Porcentaje completado"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "Priority"
-msgstr "Prioridad"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Transparencia"
-
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Pulse aqu� para a�adir una tarea"
-
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
-msgid "Edit this task"
-msgstr "Editar esta tarea"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3316 calendar/gui/e-week-view.c:3161
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3163
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Copiar"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3291 calendar/gui/e-day-view.c:3320
-#: calendar/gui/e-week-view.c:3137 calendar/gui/e-week-view.c:3165
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Pegar"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:962
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:963
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:972
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Borrar las tareas seleccionadas"
 
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Pulse aqu� para a�adir una tarea"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leto:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categor�as"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Completo"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Fecha de plazo"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Fecha fin"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Posici�n geogr�fica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridad"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Fecha de Inicio"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Resumen"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Lista de Tareas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -3093,153 +3319,148 @@ msgstr "%02i divisi�nes por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1328
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a, %d de %b de %Y"
-
 #. 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:1355
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:308
-#: calendar/gui/print.c:785
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
-#: calendar/gui/print.c:787
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3296 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3298 calendar/gui/e-week-view.c:3144
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nuevo evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3303 calendar/gui/e-week-view.c:3149
-msgid "Go to Today"
-msgstr "Ir a hoy"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3305 calendar/gui/e-week-view.c:3151
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3312 calendar/gui/e-week-view.c:3157
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Abrir"
-
-#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3159
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3179
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3181
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3333
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Este es un evento que puede ser a�adido a su calendario."
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Esta es una petici�n de reuni�n."
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Esto es una o m�s adiciones a su encuentro actual."
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Esta es una petici�n sobre la �ltima infromaci�n del evento."
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Esta es una respuesta a una petici�n de encuentro."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Esta es la cancelaci�n de un evento."
 
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Este mensaje no es comprensible."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Esta es una tarea que puede ser a�adida a su calendario."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Esta es una petici�n de tarea."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Esta es una petici�n para la �ltima informaci�n de la tarea."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Esta es una respuesta a una petici�n de tarea."
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Esto es una cancelaci�n de tarea."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Este mensaje no parece haber sido creado correctamente"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "La informaci�n dentro de este adjunto no era v�lida"
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "�No pude actualizar el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�No pude quitar el elemento del archivo de su calendario!\n"
 
@@ -3280,21 +3501,21 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Todo"
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categor�as:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�todo necesario para cargar `%s' no esta soportado"
@@ -3302,41 +3523,22 @@ msgstr "El m�todo necesario para cargar `%s' no esta soportado"
 #. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/e-week-view.c:3142 calendar/gui/e-week-view.c:3170
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nueva Cita..."
 
-#: calendar/gui/e-week-view.c:3183
-msgid "Delete All Occurrences"
-msgstr "Borrar todas las Ocurrencias"
-
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "La descripci�n contiene"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "El comentario contiene"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "Tiene la categor�a"
-
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1065
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no esta soportado"
@@ -3362,251 +3564,255 @@ msgid "Go To Date"
 msgstr "Ir a una fecha"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir a hoy"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Enero"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Julio"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Junio"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mayo"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Noviembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Octubre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:211
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir a hoy"
+
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1�"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2�"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3�"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4�"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5�"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6�"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7�"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8�"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9�"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10�"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11�"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12�"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13�"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14�"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15�"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16�"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17�"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18�"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19�"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20�"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21�"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22�"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23�"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24�"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25�"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26�"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27�"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28�"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29�"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30�"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31�"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lun"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Mar"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Mier"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Jue"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Vier"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:1847 my-evolution/e-summary-tasks.c:156
-#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a actual (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mes actual (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "A�o actual (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:478
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Configurar impresi�n"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrar� la carpeta de tareas"
 
@@ -3699,56 +3905,51 @@ msgstr "Resincronizando con el servidor"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para competar esta operaci�n"
 
-#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:658
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "Completo"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parseando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
@@ -3790,10 +3991,12 @@ 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:110
+#, 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:123
+#, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "No puedo hacer un fork del ayudante de bloqueo: %s"
 
@@ -3803,6 +4006,7 @@ 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:212
+#, c-format
 msgid "Could not lock '%s'"
 msgstr "No puedo bloquear '%s'"
 
@@ -3827,56 +4031,56 @@ msgstr "Fallo al hacer un lock usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo al hacer un lock usando flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "No pude comprobar el archivo de correo %s: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No pude abrir el archivo de correo %s: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No pude abrir el archivo de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error leyendo el archivo de correo: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error escribiendo en el archivo temporal de correo: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Fall� al guardar el correo en al archivo temporal %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No pude crear un conducto(pipe): %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No se puede hacer un fork: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallado: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Error desconocido)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Error leyendo el archivo de correo: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Error escribiendo en el archivo temporal de correo: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
@@ -3963,7 +4167,7 @@ msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
@@ -3972,13 +4176,13 @@ msgstr "No pude conectar con %s (puerto %d): %s"
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor se desconect� inesperadamente"
 
@@ -4089,7 +4293,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificaci�n err�nea desde el servidor."
 
@@ -4158,7 +4362,7 @@ msgstr "Para leer correo como una b�squeda de otras carpetas"
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4204,12 +4408,6 @@ msgstr "Error al docodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
-#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
-msgid "Trash"
-msgstr "Papelera"
-
 #: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
@@ -4273,26 +4471,26 @@ msgstr "No existe el mensaje: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "No puede copiar mensajes de esta papelera."
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor termin� demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:493
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 
-#: camel/providers/imap/camel-imap-command.c:530
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
@@ -4311,16 +4509,28 @@ msgstr "No puedo cargar el resumen de %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "Escaneando carpeta IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Guardando mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1763
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1796
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Guardando mensajes"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -4329,7 +4539,7 @@ 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-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
 
@@ -4337,7 +4547,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:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -4369,28 +4579,28 @@ msgstr "Para leer y guardar correo en los servidores IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectar� con el servidor IMAP usando una contrase�a de texto plano"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticaci�n %s"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4401,11 +4611,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
@@ -4479,7 +4693,7 @@ msgstr "No pude borrar el resumen la carpeta `%s': %s"
 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:404
+#: camel/providers/local/camel-local-summary.c:417
 #: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude a�adir mensajes al resumen: raz�n desconocida"
@@ -4680,7 +4894,7 @@ msgstr "No puedo resumir la carpeta: %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1468
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
@@ -4738,7 +4952,7 @@ msgstr "No pude cerrar la carpeta temporal: %s"
 msgid "Could not rename folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
@@ -4761,14 +4975,17 @@ msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 
 #: camel/providers/local/camel-spool-folder.c:465
+#, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "No puedo a�adir el mensaje al archivo: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:132
+#, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' no existe o no es un archivo normal."
 
 #: camel/providers/local/camel-spool-store.c:159
+#, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
 
@@ -4792,6 +5009,7 @@ msgstr ""
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
+#, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No pude sincronizar la carpeta temporal %s: %s"
 
@@ -4924,7 +5142,7 @@ msgstr "Dejar mensajes en el servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar tras %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -5017,7 +5235,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5070,7 +5288,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Env�o de correo v�a el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:76
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5078,124 +5296,124 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conect�ndose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los par�metros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Par�metro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviar� a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "Acci�n solicitada del correo no realizada: el mailbox no est� disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Acci�n solicitada no realizada: el mailbox no est� disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Acci�n solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Acci�n solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Acci�n solicitada no realizada: excedi� la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Acci�n solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Fallo en la transacci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Es necesaria una transici�n de contrase�a"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "El m�todo de autenticaci�n en demasiado debil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encriptaci�n requerida por el mecanismo de autenticaci�n pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticaci�n requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Mensaje de bienvenida err�neo: %s: posiblemente no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "El servidor SMTP %s no soporta el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5206,116 +5424,130 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Env�o de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "No puedo enviar el mensaje: direcci�n del remitente no definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando mensaje"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Reuni�n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Expir� el tiempo para HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Respuesta de error al HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentificaci�n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "Error en la petici�n de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Respuesta de error a DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Expir� el tiempo para el env�o de DATA: terminaci�n del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Respuesta de error a DATA: terminaci�n del mensaje: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expir� el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Expir� el tiempo para QUIT: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -5345,7 +5577,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "adjunto"
 
@@ -5378,52 +5610,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:325
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Presione aqu� para acceder a la agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibir�n una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5454,29 +5686,29 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, �Sobreescribir?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5484,16 +5716,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:1043
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5502,7 +5734,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5511,7 +5743,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5520,20 +5752,16 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
+#, fuzzy
 msgid ""
-"Evolution has found unsaved files from a previous sesiion.\n"
+"Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
 "Evolution ha encontrado archivos no guardados de sesiones previas.\n"
 "�Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5543,19 +5771,24 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2243
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2337
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -5584,40 +5817,56 @@ msgid "calendar information"
 msgstr "informaci�n del calendario"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m %d %Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5625,65 +5874,65 @@ msgstr "%a %m %d %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "a�o"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "a�os"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Te has olvidado de elegir una fecha."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Has elegido una fecha incorrecta."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5693,7 +5942,7 @@ msgstr ""
 "fecha del momento de ejecutar el filtro o\n"
 "cuando se abra el vfolder."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5701,7 +5950,7 @@ msgstr ""
 "La fecha del mensaje ser� comparada con la\n"
 "fecha que especifique aqu�."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5712,28 +5961,36 @@ msgstr ""
 "filtro. Por ejemplo: �Hace una semana�."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "la fecha actual"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "Una fecha a especificar"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "una fecha relativa al momento actual"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "ahora"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<pinche aqu� para a�adir una fecha>"
 
@@ -5758,8 +6015,8 @@ msgstr ""
 "Oops, te has olvidado de elegir una carpeta.\n"
 "Por favor vuelve y especifica una carpeta v�lida donde entregar el correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:766
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -5820,6 +6077,17 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saliente"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "A�adir"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Editar filtros"
@@ -5860,206 +6128,197 @@ msgstr "con todas las carpetas locales y remotas activas"
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Asignar Color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar puntuaci�n"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepci�n"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de env�o"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "no contiene"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "No Existe"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Reenviar a direcci�n"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "es"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Se recibi� el mensaje"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Se envi� el mensaje"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "en o despu�s de"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "en o antes de"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Le�do"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Expresi�n regular"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Tama�o (kB)"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Cabecera espec�fica"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Estado"
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:34 mail/mail-format.c:861
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:37
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:43
-msgid "ends with"
-msgstr "finaliza con"
-
-#: filter/libfilter-i18n.h:44
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:47
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:48
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or after"
-msgstr "en o despu�s de"
-
-#: filter/libfilter-i18n.h:50
-msgid "on or before"
-msgstr "en o antes de"
-
-#: filter/libfilter-i18n.h:51
-msgid "sounds like"
-msgstr "suena como"
-
 #: filter/libfilter-i18n.h:52
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "estaba despu�s de"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "estaba antes de"
 
@@ -6079,28 +6338,23 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 msgstr "Reglas de puntuaci�n"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importar"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Correo"
 
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Alias de Elm"
-
-#: importers/elm-importer.c:517 importers/netscape-importer.c:796
-#: importers/pine-importer.c:660 shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "No me preguntes m�s veces"
-
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6108,11 +6362,11 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Elm\n"
 "�Quiere importarlos a Evolution?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Correo de Elm"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
@@ -6124,19 +6378,11 @@ msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
 "�Quiere importarlos a Evolution?"
 
-#: importers/netscape-importer.c:779 importers/pine-importer.c:648
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Configuraci�n"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1710
-msgid "Filters"
-msgstr "Filtros"
-
-#: importers/netscape-importer.c:789
-msgid "Addressbooks"
-msgstr "Agenda de direcciones"
-
-#: importers/netscape-importer.c:836
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6144,7 +6390,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Netscape.\n"
 "�Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -6152,7 +6398,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
 "�Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Correo de Pine"
 
@@ -6192,147 +6438,162 @@ msgstr "Factor�a para el componente de Resumen de Correo."
 msgid "Mail configuration interface"
 msgstr "Interface de configuraci�n del correo"
 
-#: mail/component-factory.c:679
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propiedades..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Cambiar las propiedades de esta carpeta"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:813
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:253
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para �%s�"
 
-#: mail/folder-browser-ui.c:255
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Guardar la b�squeda como una carpeta virtual"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VFolder seg�n el a_sunto"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VFolder seg�n el _remitente"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VFolder seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1236
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1260
-msgid "_Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:1264 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1282
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1284
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como _Importante"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1291
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "A�adir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1305
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtrar seg�n la lista de correo"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
@@ -6402,11 +6663,11 @@ msgstr "Editor de Noticias de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:956
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6416,28 +6677,38 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr "(valores predeterminados)"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Habilitado"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "�Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Borrar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Hacer de esta mi cuenta predeterminada"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "�Esta seguro que quiere borrar esta cuenta de noticias?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:709
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -6525,29 +6796,29 @@ msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El d�a %s, %s escribi�:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1339
+#: mail/mail-callbacks.c:1374
 #, 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:1361
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6555,7 +6826,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1395
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6563,24 +6834,24 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1442
 #, 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:1428
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1510
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1512
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1700
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6589,15 +6860,19 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1758
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtros"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1805
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1966
 #, 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?"
@@ -6647,11 +6922,11 @@ msgstr ""
 "usar� para mostrar informaci�n."
 
 #. set window title
-#: mail/mail-config-druid.c:463
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Configurador de cuentas de Evolution"
 
-#: mail/mail-config.c:1563 mail/mail-config.c:1566
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -6664,58 +6939,63 @@ msgid " color"
 msgstr "color"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Firmar no esta soportado por este cifrado"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Cuenta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informaci�n de la cuenta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Gesti�n de la cuenta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Cargar imagenes fuera de la red"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autentificaci�n"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tipo de autentificaci�n: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Comprobar el correo autom�ticamente cada"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID del certificado:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Nuevo"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6731,253 +7011,272 @@ msgstr ""
 "\n"
 "Pulse �Finalizar� para guardar su configuraci�n."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Va_lores predeterminados"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "El estilo predeterminado de �Reenvio� es: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Direcci�n de correo:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "Vaciar papelera al salir"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "Firma en HTML:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Resaltadar citas con"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Incluido en l�nea"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Cargar im�genes si el remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configuraci�n del correo"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato Mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Hacer de esta mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensajes como �le�do� tras:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "No cargar nunca im�genes desde la red"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizaci�n:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "ID de la clave PGP:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Localizaci�n del binario de PGP:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
 msgid "Prompt when sending messages with an empty subject"
 msgstr "Preguntar al mandar mensajes con el asunto vacio"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Preguntar al mandar mensajes con el asunto vacio"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr "Recordar la frase de paso de PGP hasta salir del programa"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Informaci�n Requerida"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar el mensaje en formato HTML de forma predeterminada"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configuraci�n del servidor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificaci�n"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Informaci�n de la Fuente"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Mabox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:96
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Use conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nombre:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6987,23 +7286,15 @@ msgstr ""
 "\n"
 "Pulse �Siguiente� para comenzar. "
 
-#: mail/mail-config.glade.h:104 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
-msgid "_Edit"
-msgstr "_Editar"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "segundos."
 
@@ -7043,191 +7334,181 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificaci�n S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (v�a %s)"
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1054
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1397
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Abrir Enlaze en el Navegador"
 
-#: mail/mail-display.c:1399
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del Enlaze"
 
-#: mail/mail-display.c:1401
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Guardar Enlaze como (ARREGLAME)"
 
-#: mail/mail-display.c:1403
-msgid "Save Image as"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
 msgstr "Guardar Imagen como..."
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/mail-folder-cache.c:170 mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:171
+#: mail/mail-folder-cache.c:177
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/mail-folder-cache.c:178
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d nuevos"
+
+#: mail/mail-folder-cache.c:188
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-format.c:603
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:734 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:850 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Direcci�n de correo:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:856 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:859
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1197
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1204
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1260
+#: mail/mail-format.c:1377
 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:1268
+#: mail/mail-format.c:1388
 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:1920
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1932
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en �%s�"
 
-#: mail/mail-format.c:1936
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1970
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:1975
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abriendo '%s'"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar la carpeta �%s� al formato �%s�"
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr "Reconfigurar carpeta"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr "Cerrando carpeta actual"
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr "Renombrando carpeta antigua y abri�ndola"
-
-#: mail/mail-local.c:856
-msgid "Creating new folder"
-msgstr "Creando una nueva carpeta"
-
-#: mail/mail-local.c:870
-msgid "Copying messages"
-msgstr "Copiando mensajes"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7236,7 +7517,7 @@ msgstr ""
 "No puedo guardar la metainformaci�n de la carpeta: probablemente\n"
 "volver a abrir esta carpeta: %s"
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7244,12 +7525,17 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "No puede copiar mensajes de esta papelera."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7258,7 +7544,7 @@ msgstr ""
 "Error mientras `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7267,110 +7553,104 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
-
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando �%s�"
 
-#: mail/mail-ops.c:560
-msgid "Sending message"
-msgstr "Enviando mensaje"
-
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:717
 #, 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:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:783
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en �%s�"
 
-#: mail/mail-ops.c:1141
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Papelera"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1182 mail/mail-ops.c:1320
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1249
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1388
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1672
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:1682
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Obteniendo mensaje n�mero %d de %d (uid �%s�)"
-
-#: mail/mail-ops.c:1756
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7379,12 +7659,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1848
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Guardando mensaje %d de %d (uid �%s�)"
-
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7393,11 +7668,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7406,12 +7681,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
@@ -7420,23 +7695,33 @@ msgstr "Desconectar de %s"
 msgid "(Untitled Message)"
 msgstr "(Mansaje sin t�tulo)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mansaje sin t�tulo)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Mensaje"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Buscar en Mensaje"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Sensible a mayusculas"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Buscar hacia adelante"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Coincide:"
 
@@ -7468,47 +7753,35 @@ msgstr "Enviando"
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Operaci�n cancelada por el usuario."
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:207
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaje reenviado)"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sin asunto)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:236
-msgid "Forwarded message (no subject)"
-msgstr "Mensaje reenviado (sin asunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensaje reenviados"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaje Reenviado-----<br><b>De:</b> %s<br><b>A:</b> %s<br><b>Asunto:</"
-"b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensaje reenviados"
 
-#: mail/mail-vfolder.c:250
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:442
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
@@ -7572,11 +7845,16 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Guardando mensajes"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcado"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recibido"
 
@@ -7644,51 +7922,65 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:877
 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-rdf.c:379 my-evolution/e-summary-rdf.c:405
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Configuraci�n de _Mi Evolution..."
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Error obteniendo RDF</b>"
 
-#: my-evolution/e-summary-tasks.c:157
+#: my-evolution/e-summary-tasks.c:206
 msgid "No tasks"
 msgstr "No hay tareas"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:300
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Error obteniendo Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: my-evolution/e-summary-weather.c:616
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "Regiones"
 
-#: my-evolution/e-summary.c:439 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A %d de %B"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Imprimir Mi Evolution"
 
-#: my-evolution/e-summary.c:485
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "La impresi�n de Mi Evolution ha fallado"
 
@@ -7696,95 +7988,95 @@ msgstr "La impresi�n de Mi Evolution ha fallado"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cielo claro"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Nubes dispersas"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Algun nube"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Cubierto"
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "Inv�lido"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Variable"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "Norte"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "Norte - Noreste"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "Noreste"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "Este - Noreste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "Este"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "Este - Sureste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "Sureste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "Sur - Sureste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "Sur"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "Sur - Suroeste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "Suroeste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "Oeste - Suroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "Oeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "Oeste - Noroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "Noroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
@@ -7792,1207 +8084,1194 @@ msgstr "Norte - Noroeste"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "Llovizna"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Llovizna en las proximidades"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "Ligera llovizna"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Llovizna moderada"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "Fuerte Llovizna"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "Llovizna suave"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr "Tormenta"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr "Llovizna ventosa"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr "Chaparrones"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "Lluvia"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Lluvia en las proximidades"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Lluvia suave"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Lluvia moderada"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "Lluvia fuerte"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "Lluvia suave"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Drifting rain"
 msgstr "La descripci�n contiene"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Buscar de nuevo"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "Nieve"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Nevadas en las proximidades"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Ligera nevada"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Nevada moderada"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "Nevada fuerte"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "Nevada suave"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Tormenta de nieve"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr "Granizada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr "Granizada en las proximidades"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr "Ligera granizada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr "Granizada moderada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr "Fuerte granizada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr "Granizada suave"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "La descripci�n contiene"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Helada"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Heladas en las proximidades"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Algunas placas de hielo"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Helada moderada"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr "Helada intensa"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "Helada parcial"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Tormenta de hielo"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr "Ventisca de hielo"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Hail"
 msgstr "Correo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Partial hail"
 msgstr "Correo electr�nico principal"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Recibiendo Mensajes"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Estado de la autenticaci�n desconocido."
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Light precipitation"
 msgstr "Resaltadar citas con"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Error desconocido"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Invitaciones para la reuni�n"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Mist"
 msgstr "Se�orita"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Partial mist"
 msgstr "Vertical"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Lista de correo"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Shallow fog"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Cerrar esta ventana"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke"
 msgstr "Almacenar"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Mostrar tareas"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Cerrar esta ventana"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 #, fuzzy
 msgid "Sand"
 msgstr "Enviar"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 #, fuzzy
 msgid "Haze"
 msgstr "Cabecera"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 #, fuzzy
 msgid "Sprays"
 msgstr "d�as"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 #, fuzzy
 msgid "Dust"
 msgstr "Agosto"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 #, fuzzy
 msgid "Raging tornado"
 msgstr "Cosas por hacer"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 #, fuzzy
 msgid "Thunderous tornado"
 msgstr "Cosas por hacer"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add ->"
-msgstr "A�adir"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add new feed"
 msgstr "Contestado"
 
-#: my-evolution/my-evolution.glade.h:3
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "All folders:"
 msgstr "Seleccionar carpeta"
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 msgid "All news feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
 msgid "All stations:"
 msgstr "Todas las estaciones"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:6
 msgid "Display folders:"
 msgstr "Mostrar carpetas:"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:7
 msgid "Display stations:"
 msgstr "Mostrar estaciones:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "Displayed feeds:"
 msgstr "Mostrar"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:9
 msgid "Five days"
 msgstr "Cinco dias"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
 msgid "Max number of items shown:"
 msgstr "N�mero m�ximo de elementos mostrados:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Configuraci�n"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
 msgid "News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
 msgid "One day"
 msgstr "Un d�a"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:16
 msgid "One month"
 msgstr "Un mes"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:17
 msgid "One week"
 msgstr "Una semana"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:18
 msgid "Refresh time (seconds):"
 msgstr "Tiempo de actualizaci�n (segundos):"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "Remove <-"
-msgstr "Quitar <-"
-
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:19
 msgid "Schedule"
 msgstr "Horario"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:20
 msgid "Show all tasks"
 msgstr "Mostrar tadas las tareas"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:21
 msgid "Show full path for folders"
 msgstr "Mostrar ruta completa a las carpetas"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:22
 msgid "Show today's tasks"
 msgstr "Mostrar las tareas de hoy"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:23
 msgid "Tasks "
 msgstr "Tareas "
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:24
 msgid "Units: "
 msgstr "Unidades: "
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "Weather"
 msgstr "Tiempo"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "Weather settings"
 msgstr "Quitar la seleccionada"
 
-#: my-evolution/my-evolution.glade.h:29
-msgid "Wipe trackers"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:27
 msgid "imperial"
 msgstr "anglosaj�n"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "m�trico"
 
@@ -9008,7 +9287,12 @@ msgstr "Mostrar Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
-#: shell/e-setup.c:125 shell/e-setup.c:195
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Carpetas Especiales"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
 
@@ -9023,24 +9307,24 @@ msgstr ""
 #: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-"Por favor, pulse en �Aceptar� para instalar los archivos, o �Cancelar� "
-"para salir."
+"Por favor, pulse en �Aceptar� para instalar los archivos, o �Cancelar� para "
+"salir."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "No pude actualizar correctamente los archivos"
 
-#: shell/e-setup.c:199
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Parece que esta es la primera vez que ejecuta Evolution"
 
-#: shell/e-setup.c:200
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Por favor, pulse en �Aceptar� para instalar los archivos de usuario de "
 "Evolution en"
 
-#: shell/e-setup.c:219
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9051,7 +9335,8 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:234
+#: shell/e-setup.c:235
+#, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
@@ -9059,7 +9344,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "`%s'."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9070,7 +9355,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalaci�n\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:313
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9084,7 +9369,7 @@ msgstr ""
 "Evolution.\n"
 "�Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:338
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9140,7 +9425,7 @@ msgstr "�Esta seguro que quiere borrar la carpeta `%s'?"
 msgid "Rename folder '%s'"
 msgstr "Renombrar carpeta '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9149,11 +9434,11 @@ msgstr ""
 "No puedo crear la carpeta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "El nombre de carpeta especificado no es valido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
@@ -9165,11 +9450,11 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operaci�n requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sin t�tulo)"
 
@@ -9277,19 +9562,19 @@ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9299,59 +9584,61 @@ msgstr ""
 "trabajo en grupo para manejar el correo, el calendario y\n"
 "la lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:453
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:454
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:599
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:600
+#: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:717 shell/e-shell-view-menu.c:729
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:173
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostr�ndose)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1391 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 msgid "My Evolution"
 msgstr "Mi Evolution"
 
-#: shell/e-shell-view.c:1408
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1410
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1448
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution est� conectado.  Pulse este bot�n para trabajar desconectado."
 
-#: shell/e-shell-view.c:1455
+#: shell/e-shell-view.c:1458
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution est� en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1461
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution est� desconectado.  Pulse este bot�n para trabajar conectado."
@@ -9361,7 +9648,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1308
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -9391,160 +9678,164 @@ msgstr ""
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Renombrar Grupo de Atajos"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icono_s peque�os"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos peque�os"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Abrir en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Renombrar"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:614
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1011
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-shortcuts.c:1013
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-shortcuts.c:1016
+#: shell/e-shortcuts.c:987
 msgid "Contacts"
 msgstr "Contactos"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sin nombre)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Error gen�rico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de fichero especificado no es v�lido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "No se encontr� la carpeta especificada"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funci�n sin implementar en este manejador"
 
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operaci�n no soportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado por este manejador"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
@@ -9606,7 +9897,16 @@ msgstr "Importadores"
 msgid "Don't import"
 msgstr "No importar"
 
-#: shell/main.c:89
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "No me preguntes m�s veces"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -9621,7 +9921,9 @@ msgid ""
 "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 Evolution.\n"
+"Hola. Gracias por tomarse la molestia de descargar esta liberaci�n de "
+"prueba\n"
+"de la herramienta de trabajo en grupo Evolution.\n"
 "\n"
 "Evolution todav�a no est� completa. Se est� acercando, pero hay sitios\n"
 "donde faltan las utilidades o solo funcionan a medias. \n"
@@ -9633,7 +9935,7 @@ msgstr ""
 "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
 "�esperamos sus contribuci�nes!\n"
 
-#: shell/main.c:110
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9641,28 +9943,28 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:148
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "No puedo acceder a la shell de Evolution."
 
-#: shell/main.c:208
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Desahilitar pantalla de entrada"
 
-#: shell/main.c:209
+#: shell/main.c:216
 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:244
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "C_ortar"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Copiar la selecci�n"
 
@@ -9674,7 +9976,11 @@ msgstr "Crear nuevo contacto"
 msgid "Create new contact list"
 msgstr "Crear nueva lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Cortar la selecci�n"
 
@@ -9690,7 +9996,11 @@ msgstr "Nuevo contacto"
 msgid "New list"
 msgstr "Nueva lista"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del porta papeles"
 
@@ -9730,19 +10040,8 @@ msgstr "_Contacto"
 msgid "_Contact Group"
 msgstr "_Contactar con el Grupo"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Im_primir..."
 
@@ -9754,172 +10053,131 @@ msgstr "Bu_scar contactos"
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 D�as"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Alterar preferencias"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crear un nuevo evento de todo el d�a"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear una nueva cita"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Creando un nuevo calendario"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "D�a"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Volver en el tiempo"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Avanzar en el tiempo"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Ir a _hoy"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir a una fecha espec�fica"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir al momento actual"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Nuevo _Evento"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-msgid "Next"
-msgstr "Siguiente"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Abrir calendario"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Previo"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nueva cita"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Imprimir calendario"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "Informaci�n Requerida"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Guardar como"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Guardar el calendario como otra cosa"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Configuraci�n..."
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Mostrar 1 d�a"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Mostrar 1 semana"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-msgid "Today"
-msgstr "Hoy"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Semana lab_oral"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "Cit_a"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Configuraci�n del correo..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_D�a"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-msgid "_New"
-msgstr "_Nuevo"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "_Abrir calendario"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Semana"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Cerrar"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Cerrar"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9938,7 +10196,7 @@ msgstr "Barra de herramientas principal"
 msgid "Preview the printed item"
 msgstr "Ver el elemento que va a ser impreso"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Vista pre_via"
 
@@ -9947,17 +10205,15 @@ msgid "Print S_etup"
 msgstr "Configurar Impr_esi�n"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Imprimir..."
 
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
@@ -9977,20 +10233,15 @@ msgstr "Configurar los datos de la p�gina para la impresora actual"
 msgid "_Action"
 msgstr "_Acci�n"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Archivo"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "A_yuda"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
@@ -10005,13 +10256,12 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Imprimir ca_becera..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
@@ -10033,28 +10283,32 @@ msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Guardar"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Borrar este grupo"
+#, fuzzy
+msgid "Delete this list"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Guardar el grupo y cerrar la ventana de di�logo"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Guardar el contacto y cerrar la ventana de di�logo"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "E_nviar el egrupo a otro..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar el contacto a otro..."
 
 #
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "Enviar un _mensaje al grupo..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -10110,79 +10364,84 @@ msgid "Compose"
 msgstr "Nuevo"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Nuevo mensaje"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Crear o editar cuentas de correo y otras preferencias"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de mensajes"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Crear o editar definiciones de carpetas virtuales"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Olvidar _contrase�a"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvidar las contrase�as recordadas con lo que ser� preguntado de nuevo"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "Administrar _suscripciones..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Abrir una ventana para escribir un mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los mansajes borrados de todas las carpetas"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o desuscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Configuraci�n del correo..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
@@ -10207,7 +10466,8 @@ msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _le�dos"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -10378,19 +10638,23 @@ msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no le�do"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtrar seg�n la _lista de correo"
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtrar seg�n el remite_nte"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtrar seg�n los destinata_rios"
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtrar seg�n el a_sunto"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -10433,171 +10697,210 @@ msgstr "Reenviar el mensaje seleccionado a alguien"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenviar el mensaje seleccionado como un adjunto a alguien"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Cargar _Im�genes"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "Mar_car como Le�do"
-
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As I_mportant"
-msgstr "Marcar como I_mportante"
-
 #: ui/evolution-mail-message.xml.h:41
-msgid "Mark As U_nread"
-msgstr "Marcar como _no le�do"
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Marcar como _Importante"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Marcar como _Importante"
+
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leidos"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leidos"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar los mensajes seleccionados como importantes"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Siguiente"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Mostrar el siguiente mensaje importante"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Mensaje"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleccionar _Hilo"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "(Mansaje sin t�tulo)"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Abrir el mensaje seleccionado en una nueva ventana"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abrir el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Previo"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Mostrar el anterior mensaje importante"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir mensaje"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Mostrar el anterior mensaje no le�do"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Imprimir Mensaje..."
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Vista previa..."
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Print message to the printer"
-msgstr "Imprimir el mensaje en la impresora"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redirigir (ARREGLAME: implementame)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir mensaje"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "Buscar M_ensaje"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Mostrar la Fuente del Men_saje"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual seg�n la _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VFolder seg�n el Remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VFolder seg�n los Destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VFolder seg�n el A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Reenviar Mensaje"
 
@@ -10618,7 +10921,7 @@ msgid "Customize toolbars"
 msgstr "Personalizar barras de herramientas"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 msgid "_Close"
@@ -10658,153 +10961,159 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Insertar un archivo de texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Insertar un archivo como texto en el mensaje"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Encriptar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Guardar"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Guardar como"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta espec�fica"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar el mensaje m�s tarde"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Attachment"
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
 msgstr "_Adjunto"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Insertar un archivo de texto..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
@@ -10817,6 +11126,10 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridad"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "A_yuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "A�adir carpeta a tu lista de carpeta suscritas"
@@ -10858,40 +11171,41 @@ msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copiar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Cortar las tareas seleccionadas"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Borrar las tareas seleccionadas"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Pegar la tarea del portapapeles"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Guardar la tarea como otra cosa"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Configurar las preferencias de la vista de tareas"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Preferencias de las tareas..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Preferencias de las tareas"
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Configuraci�n del correo..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -11017,10 +11331,6 @@ msgstr "Usando el _correo"
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:38
-msgid "Work Offline"
-msgstr "Trabajar desconectado"
-
 #: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
@@ -11061,6 +11371,10 @@ msgstr "_Enviar mensaje"
 msgid "_Move..."
 msgstr "_Mover..."
 
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nuevo"
+
 #: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
@@ -11132,10 +11446,6 @@ msgstr "Con categor�a"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
@@ -11218,19 +11528,18 @@ 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:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Ahora"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoy"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
@@ -11297,6 +11606,7 @@ msgid "New"
 msgstr "Nuevo"
 
 #: widgets/misc/e-charset-picker.c:160
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "Juego de caracteres desconocido: %s"
 
@@ -11316,19 +11626,24 @@ msgstr "Codificaci�n de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contactos"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "B�queda avanzada"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzado..."
 
@@ -11381,3 +11696,208 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Configurar las preferencias de la vista de tareas"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferencias de las tareas"
+
+#~ msgid "(none)"
+#~ msgstr "(nada)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Compa��a:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry"
+#~ msgstr "Notificaci�n sobre su cita en %A %b %d %Y %H:%M"
+
+#~ msgid "File not found"
+#~ msgstr "Archivo no encontrado"
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir calendario"
+
+#~ msgid "Save calendar"
+#~ msgstr "Guardar calendario"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Mostrar un di�logo"
+
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaje completado"
+
+#~ msgid "Edit this task"
+#~ msgstr "Editar esta tarea"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ir a hoy"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Borrar todas las Ocurrencias"
+
+#~ msgid "Summary contains"
+#~ msgstr "El resumen contiene"
+
+#~ msgid "Description contains"
+#~ msgstr "La descripci�n contiene"
+
+#~ msgid "Comment contains"
+#~ msgstr "El comentario contiene"
+
+#~ msgid "Has category"
+#~ msgstr "Tiene la categor�a"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Escaneando carpeta IMAP"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar a direcci�n"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Alias de Elm"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Agenda de direcciones"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar la carpeta �%s� al formato �%s�"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Reconfigurar carpeta"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Cerrando carpeta actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renombrando carpeta antigua y abri�ndola"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Creando una nueva carpeta"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiando mensajes"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Obteniendo mensaje n�mero %d de %d (uid �%s�)"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Guardando mensaje %d de %d (uid �%s�)"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaje reenviado)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (sin asunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaje reenviado (sin asunto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaje Reenviado-----<br><b>De:</b> %s<br><b>A:</b> "
+#~ "%s<br><b>Asunto:</b> %s<br>"
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Error obteniendo Metar</b>"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "A�adir"
+
+#~ msgid "Remove <-"
+#~ msgstr "Quitar <-"
+
+#~ msgid "Work offline"
+#~ msgstr "Trabajar desconectado"
+
+#~ msgid "5 Days"
+#~ msgstr "5 D�as"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alterar preferencias"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Creando un nuevo calendario"
+
+#~ msgid "Day"
+#~ msgstr "D�a"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "New _Event"
+#~ msgstr "Nuevo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Abrir calendario"
+
+#~ msgid "Prev"
+#~ msgstr "Previo"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Guardar el calendario como otra cosa"
+
+#~ msgid "Settings..."
+#~ msgstr "Configuraci�n..."
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir calendario"
+
+#~ msgid "Delete this group"
+#~ msgstr "Borrar este grupo"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Guardar el grupo y cerrar la ventana de di�logo"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "E_nviar el egrupo a otro..."
+
+#
+#~ msgid "Send _message to group..."
+#~ msgstr "Enviar un _mensaje al grupo..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_car como Le�do"
+
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Marcar como I_mportante"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _no le�do"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir el mensaje en la impresora"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redirigir (ARREGLAME: implementame)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Insertar un archivo de texto..."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Preferencias de las tareas..."
diff --git a/po/fi.po b/po/fi.po
index 3d95876d12..b905f241ac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-05-08 09:51+0000\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-08 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3278
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kortti: "
 
-#: addressbook/backend/ebook/e-card.c:3280
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3281
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3282
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +49,7 @@ msgstr ""
 "\n"
 "  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3283
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +57,7 @@ msgstr ""
 "\n"
 "  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3284
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,13 +65,13 @@ msgstr ""
 "\n"
 "  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3285
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3299
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +79,7 @@ msgstr ""
 "\n"
 "Syntym�p�iv�: "
 
-#: addressbook/backend/ebook/e-card.c:3310
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +87,7 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3312
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,13 +95,13 @@ msgstr ""
 "\n"
 "  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3313
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -101,7 +109,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3315
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -109,13 +117,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -123,7 +131,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -131,13 +139,13 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3343
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -145,7 +153,7 @@ msgstr ""
 "\n"
 "Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -153,7 +161,7 @@ msgstr ""
 "\n"
 "Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3370
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -161,7 +169,7 @@ msgstr ""
 "\n"
 "S�hk�posti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3373
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -169,13 +177,13 @@ msgstr ""
 "\n"
 "S�hk�posti:"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3398
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +191,7 @@ msgstr ""
 "\n"
 "Aikavy�hyke: "
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,19 +199,19 @@ msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3410
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -211,7 +219,7 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3424
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -219,7 +227,7 @@ msgstr ""
 "\n"
 "  Yksikk�: "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -227,7 +235,7 @@ msgstr ""
 "\n"
 "  Yksikk�2: "
 
-#: addressbook/backend/ebook/e-card.c:3426
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -235,7 +243,7 @@ msgstr ""
 "\n"
 "  Yksikk�3: "
 
-#: addressbook/backend/ebook/e-card.c:3427
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -243,7 +251,7 @@ msgstr ""
 "\n"
 "  Yksikk�4: "
 
-#: addressbook/backend/ebook/e-card.c:3431
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -251,7 +259,7 @@ msgstr ""
 "\n"
 "Ryhm�t: "
 
-#: addressbook/backend/ebook/e-card.c:3432
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -267,13 +275,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3445
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3448
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -281,36 +289,24 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
@@ -323,14 +319,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -339,717 +335,844 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP-palvelin"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Tiedosto"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tuntematon osoitekirjatyyppi"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Salasana"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Muista t�m� salasana"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Is�nt�palvelin:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Portti:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Todennus:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Polku:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Luo polku mik�li sit� ei ole olemassa."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Muokkaa osoitekirjaa"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Lis�� osoitekirja"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Valitse osoitekirjan tyyppi, ja anna sen j�lkeen tarpeelliset tiedot siit�."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nimi:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Lis��"
+msgid "Addressbook Sources"
+msgstr "Osoitekirjan l�hteet"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Poista"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nimi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Lis��"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Muut kontaktit"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Osoitekirjaa ei voitu avata"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Mik� tahansa kentt� sis�lt��"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nimi sis�lt��"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "S�hk�posti sis�lt��"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nimi sis�lt��"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Ensisijainen s�hk�posti"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "S�hk�posti 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "S�hk�posti 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Valitse tiedosto"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Luo uusi kontakti"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Muokkaa osoitekirjaa"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Lis�� kontakteihin"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "S�hk�postiosoite:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Poista"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Poista kaikki"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "L�htev� posti"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Muut kontaktit"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Vastaanottajat"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Valitse nimet"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Valitse tiedosto"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Ryhm�t:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Etsi"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_y�paikka"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Ty�-_faksi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontaktit..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ry_hm�t..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Uusi puhelintyyppi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisaatio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Puhelintyypit"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Ensisijainen s�hk�posti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Haluaa s�hk�postit HTML-muodossa"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Kotisivun osoite:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Lis��"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Osoite..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Syntym�p�iv�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Ty�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Yritys:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontaktit..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:640 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Koko nimi..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Koti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Teht�v�nimike:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "Puoli_so:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_T�m� on postitusosoite"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Poista kontakti?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "T�m� kontakti kuuluu n�ihin ryhmiin:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Ty�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Ty� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Ty�/faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "S�hk�posti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "S�hk�posti 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Poista kontakti?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalis�ys"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "S�hk�posti"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Osoite _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Suomi"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Yhdysvallat"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Osavaltio/l��ni:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tarkasta kokonimi"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Neiti"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Hra."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Rva."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Nti."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:408
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
-
-#: addressbook/gui/component/addressbook.c:443
-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:448
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:456
-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:607 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "Mik� tahansa kentt� sis�lt��"
-
-#: addressbook/gui/component/addressbook.c:608
-msgid "Name contains"
-msgstr "Nimi sis�lt��"
-
-#: addressbook/gui/component/addressbook.c:609
-msgid "Email contains"
-msgstr "S�hk�posti sis�lt��"
-
-#: addressbook/gui/component/addressbook.c:752
-msgid "The URI that the Folder Browser will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP-palvelin"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Tiedosto"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tuntematon osoitekirjatyyppi"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Salasana"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Tiedostonimi:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Joulukuu"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Muista t�m� salasana"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Is�nt�palvelin:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Portti:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Poista"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Todennus:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Polku:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Luo polku mik�li sit� ei ole olemassa."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Muokkaa osoitekirjaa"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Lis�� osoitekirja"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Valitse osoitekirjan tyyppi, ja anna sen j�lkeen tarpeelliset tiedot siit�."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nimi:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Osoitekirjan l�hteet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Poista"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nimi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Lis�� kontakteihin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Poista"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Poista kaikki"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Etsi..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Vastaanottajat"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Valitse nimet"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:148
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Etsi"
 
@@ -1161,150 +1284,250 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "L�het� viesti kontaktille"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "L�hteet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Ty�skentele poissa linjoilta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O-virhe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, 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:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "S�hk�posti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Ty�puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Ty�osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Ty�puhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Valmis"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Ladataan kalenteria..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:469
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1342,7 +1565,8 @@ msgid "Dimensions:"
 msgstr "Mitat:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Kirjasin..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1402,7 +1626,6 @@ msgid "Margins"
 msgstr "Reunukset"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Sarakkeiden m��r�:"
 
@@ -1482,37 +1705,61 @@ msgstr "Tyyppi:"
 msgid "Width:"
 msgstr "Leveys:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Kirjasin..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1522,140 +1769,250 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Sulje"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Muokkaa tapaamista"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr ""
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Avaa kalenteri"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Tallenna kalenteri"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:694
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Korkea"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:693
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:692
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Matala"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Peruutettu"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1666,7 +2023,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1674,134 +2031,311 @@ msgstr ""
 "'M��rittelem�t�n'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "M��rittelem�t�n"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
 "'M��rittelem�t�n'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "M��rittelem�t�n"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_N�yt�"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Tapaamiset"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Ty�viikk_o"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Viikko"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Teht�v�t"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Kuukausi"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Virhe ladattaessa kalenteria</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI jonka kalenteri n�ytt��"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tueta"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Vastaanottajat"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "N�yt� asetukset"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "N�yt� tapaamiset"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "N�yt� teht�v�t"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Ladataan kalenteria"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Viestit"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI jonka kalenteri n�ytt��"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Aja ohjelma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "p�iv��"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "P�ivit� joka"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "tuntia"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuutti"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d p�iv��"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 p�iv�"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d viikkoa"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 viikko"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d tuntia"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 tunti"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minuuttia"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minuutti"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d sekuntia"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 sekunti"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Sulje"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Muokkaa tapaamista"
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "L�het� s�hk�postia"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Aja ohjelma"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Muistuta minua kaikista tapaamisista"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "P�iv�ys & Aika"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Muistutukset"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Kuvaus:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Asetukset"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "j�lkeen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "ennen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "p�iv�(�)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "tunti(a)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minuutti"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
@@ -1833,36 +2367,37 @@ msgid "60 minutes"
 msgstr "60 minuuttia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "Kalenteri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "Kalenterin asetukset"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "Kalenteri"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Kalenterin asetukset"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "V�rit"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Tiivist� viikonloput"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1870,1027 +2405,1154 @@ msgid "Defaults"
 msgstr "Oletukset"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "N�yt� asetukset"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "End of day:"
 msgstr "P�iv�n loppu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Korosta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Valitse v�ri"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioriteetti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Muistuta minua kaikista tapaamisista"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Muistutukset"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "N�yt�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "N�yt� tapaamisten loppumisajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "N�yt� viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "P�iv�n alku:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Teht�v�t"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Torstai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Aikavy�hyke: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Ty�viikko"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Ty�viikk_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuuttia niit� ennen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "sekuntia."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, 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
+#, 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
+#, 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
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Teht�v� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Ei kuvausta"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Kirjoita tiedoston yli?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Saman niminen tiedosto on jo olemassa.\n"
+"Kirjoitetaanko sen yli?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Tallenna nimell�..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 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:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Haluatko tallentaa muutokset?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "Muokkaa teht�v��"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Haluatko todella poistaa teht�v�n '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "Teht�v� - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Valitse tiedosto"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "K��nn� valinta"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
 msgstr ""
+"\n"
+"Aikavy�hyke: "
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Ei kuvausta"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Tapaaminen"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Muistutus"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Koko p�iv�n kest�v� tapahtuma"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "P�iv�ys & Aika"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Y_ksityinen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "_Alkamisp�iv�:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "K_uvaus:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Teht�v�"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontaktit..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioriteetti:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Tila:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Ryhm�n nimi:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Ryhm�t"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Paperil�hde:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Kuvaus"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Lis�� toiminto"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "L�pin�kyvyys"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "Hyv�ksy "
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL:"
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
-msgstr "0%"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Ammatti"
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
-msgstr "10%"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
-msgstr "20%"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autopuhelin"
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
-msgstr "30%"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
-msgstr "40%"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
-msgstr "50%"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
-msgstr "60%"
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "L�hetetyt"
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
-msgstr "70%"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Poista..."
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
-msgstr "80%"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Osanottaja"
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
-msgstr "90%"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
-msgstr "100%"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Muokkaa t�t� teht�v��..."
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Joulukuu"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Muokkaa teht�v��"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Poista t�m� teht�v�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rooli"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Poista teht�v�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Tila"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tyyppi"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisoija:"
 
-#. 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisoija:"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+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:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisoija:"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
-msgstr "Uusi tapaaminen"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
-msgstr "Uusi koko p�iv�n tapahtuma"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Siirry t�h�n p�iv��n"
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
-msgstr "Siirry p�iv��n..."
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "p�iv�"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Avaa"
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
-msgstr "Poista t�m� tapaaminen"
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Joka"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Muuta"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "En pystynyt avaamaan kalenteritiedostoasi!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "kuukautta"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "En pystynyt lataamaan kalenteritiedostoasi!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "En pystynyt lukemaan kalenteritiedostoasi!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "viikkoa"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "vuotta"
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr ""
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Haluatko tallentaa muutokset?"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Lis�� kalenteriin"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr "Hyv�ksy "
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "M��rittelem�t�n"
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "P�ivit� kalenteri"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Peruuta tapaaminen"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Teht�v�"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:2
 #, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
-msgid "Date:"
-msgstr "P�iv�ys:"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "_Alkamisp�iv�:"
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Ladataan kalenteria..."
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisoija:"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioriteetti:"
 
-#: calendar/gui/e-itip-control.glade.h:10
-msgid "Server Message:"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Kuvaus:"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr "0%"
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr "10%"
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr "20%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Osanottaja"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr "30%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Osanottajan osoite"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr "40%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Osanottajat: "
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr "50%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Peruuta\n"
-"tapaaminen"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr "60%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr "70%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr "80%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr "90%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr "100%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr ""
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Avaa"
 
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopioi"
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "L_iit�"
 
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Valmis"
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rooli"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "Poista t�m� teht�v�"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1086
-msgid "Status"
-msgstr "Tila"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Poista teht�v�"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
-msgstr "Ryhm�t:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "Valmis"
 
-#: calendar/gui/e-tasks.c:298
-#, c-format
-msgid "Could not load the tasks in `%s'"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Ryhm�t"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Valmis"
 
-#: calendar/gui/event-editor.c:449
-msgid "on"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "p�iv�"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "."
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr ""
 
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr " %d p�iv��"
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Kuvaus"
 
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 p�iv�"
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Teht�v�t"
 
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d viikkoa"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "L�pin�kyvyys"
 
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 viikko"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/event-editor.c:1553
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
-msgid " %d hours"
-msgstr " %d tuntia"
+msgid "%02i minute divisions"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 tunti"
+#. 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:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuuttia"
+#. 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:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 minuutti"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekuntia"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 sekunti"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Uusi tapaaminen"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Uusi koko p�iv�n tapahtuma"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "L�het� s�hk�postia"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Siirry p�iv��n..."
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "Aja ohjelma"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Poista t�m� tapaaminen"
 
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr ""
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Tallenna nykyinen tiedosto"
 
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr ""
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Poista t�m� viesti"
 
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Koko p�iv�n kest�v� tapahtuma"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_T�m� on postitusosoite"
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Tapaaminen"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Joka"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Poikkeukset"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Muuta"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Muistutus"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Asetukset..."
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Loppumisaika:"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Alkamisaika:"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Alkamisp�iv�:"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "j�lkeen"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "ennen"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "En pystynyt avaamaan kalenteritiedostoasi!\n"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "p�iv�(�)"
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr ""
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "P�iv�ys:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "tunti(a)"
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Ladataan kalenteria"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minuutti"
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "Ladataan kalenteria..."
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "kuukautta"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "viikkoa"
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "vuotta"
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr "Ryhm�t:"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Uusi tapaaminen..."
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "Yhteenveto sis�lt��"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "Kuvaus sis�lt��"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "Kommentti sis�lt��"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "Sis�lt�� ryhm�n"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -2912,232 +3574,253 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Siirry t�h�n p�iv��n"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Tammikuu"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Hein�kuu"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Kes�kuu"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Maaliskuu"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Toukokuu"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Marraskuu"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Lokakuu"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Siirry t�h�n p�iv��n"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "La"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Teht�v�t"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Tulosta t�m� kohta"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Tulostusasetukset"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3173,80 +3856,100 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
-msgstr ""
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "V�litetty viesti - %s"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Valmis"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3278,14 +3981,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Putken luonti ep�onnistui: %s"
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Haaroitus ep�onnistui: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3300,113 +4022,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "VIrhe luettaessa viestitiedostoa: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Virhe kirjoitettaessa v�liaikaista viestitiedostoa: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Putken luonti ep�onnistui: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haaroitus ep�onnistui: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "VIrhe luettaessa viestitiedostoa: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin v�liaikaistiedostoa: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Ei annettu salasanaa."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Ei puhdasta teksti� salattavaksi."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Vastaanottajia ei ole m��ritelty"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3442,7 +4159,7 @@ msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -3451,13 +4168,13 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3554,7 +4271,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -3618,12 +4335,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3632,26 +4349,53 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Roskakori"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Tiedostoa ei ole olemassa."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Tiedostoa ei ole olemassa."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "K�ytt�j�tunnuksen l�hetys palvelimelle ep�onnistui"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Lis�� viestiin liitetiedoston"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3661,17 +4405,29 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Ei kyseist� viesti�: %s"
@@ -3680,64 +4436,75 @@ msgstr "Ei kyseist� viesti�: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Et voi kopioida viestej� t�st� roskakorista."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "V�limuistihakemistoa ei voitu avata: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento ep�onnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Tallennetaan viestej�"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Tallennetaan viestej�"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "V�limuistihakemistoa ei voitu avata: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
@@ -3745,7 +4512,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:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3777,28 +4544,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:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:464
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3806,36 +4573,49 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
-msgid "MH-format mail directories"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:40
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -3875,42 +4655,43 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3918,14 +4699,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3933,22 +4714,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -3956,11 +4742,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3970,9 +4758,12 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3981,11 +4772,13 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s ep�onnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4025,36 +4818,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -4063,21 +4865,28 @@ msgstr ""
 #: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -4092,13 +4901,14 @@ msgstr ""
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -4113,39 +4923,94 @@ msgstr "`%s' ei ole hakemisto."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s ep�onnistui\n"
+"  %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' ei ole tavallinen tiedosto."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Kansiota `%s' ei ole olemassa."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Paikallinen viestitiedosto %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "K�ytt�j�tunnuksen l�hetys palvelimelle ep�onnistui"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Ei saatu ryhm�luetteloa palvelimelta."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4158,24 +5023,24 @@ msgstr "Keskusteluryhm�t"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4226,7 +5091,7 @@ msgstr "J�t� viestit palvelimelle"
 msgid "Delete after %s day(s)"
 msgstr "Poista %s:n p�iv�n kuluttua"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4305,7 +5170,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4357,7 +5222,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4365,122 +5230,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "V�liaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4488,311 +5353,234 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 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:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "L�hetet��n viesti�"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 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:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Todennus"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:805
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:831
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:944
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:959
-#: camel/providers/smtp/camel-smtp-transport.c:977
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:996
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 tavy"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u tavua"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Liit� tiedosto"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Lis�� liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1086
-msgid "Attachment"
-msgstr "Liite"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Liitteen ominaisuudet"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr ""
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "Tallenna nimell�..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Virhe tallennettaessa tiedostoa: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Virhe avattaessa tiedostoa: %s"
-
-#: composer/e-msg-composer.c:805
-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:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"T�t� viesti� ei ole l�hetetty.\n"
-"\n"
-"Haluatko tallentaa muutokset?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Avaa tiedosto"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Tiedostoa ei ole olemassa."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Se ei ole tavallinen tiedosto."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen ep�onnistui."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Tiedosto on hyvin suuri (yli 100K).\n"
-"Haluatko varmasti liitt�� sen?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "Virhe luettaessa tiedostoa."
-
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Kirjoita viesti"
-
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 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:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4800,334 +5588,278 @@ msgstr ""
 "Anna osoitteet joihin l�hetet��n kopiot viestist� ilman ett� muut "
 "vastaanottajat n�kisiv�t t�t� (Bcc)"
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Liit� tiedosto"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
+"Could not open file %s:\n"
+"%s"
+msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
 
-#: composer/evolution-composer.c:370
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr ""
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Tallenna nimell�..."
 
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr ""
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Varoitus"
 
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Virhe avattaessa tiedostoa: %s"
 
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
 
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Viesti� ei saatu POP-palvelimelta %s: %s"
 
-#: executive-summary/component/e-summary.c:926
-#, c-format
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML-tiedostoa ei voitu avata:\n"
+"Unable to seek on file: %s\n"
 "%s"
+msgstr "Viestin tallentaminen v�liaikaistiedostoon %s ep�onnistui: %s"
 
-#: executive-summary/component/e-summary.c:940
-#, c-format
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Unable to truncate file: %s\n"
 "%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Valitse palvelu"
+msgstr "Viestin tallentaminen v�liaikaistiedostoon %s ep�onnistui: %s"
 
-#: executive-summary/component/e-summary-callbacks.c:290
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
 msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
+"Evolution on l�yt�nyt Elmin s�hk�postitiedostoja.\n"
+"Haluatko tuoda n�m� postit Evolutioniin?"
 
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"T�t� viesti� ei ole l�hetetty.\n"
+"\n"
+"Haluatko tallentaa muutokset?"
 
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Suorita %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Sulje %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Siirr� %s vasemmalle"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Siirr� %s oikealle"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Siirr� %s edelliselle riville"
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
 
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Siirr� %s seuraavalle riville"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Avaa tiedosto"
 
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Aseta %s"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Liit� tekstitiedosto..."
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Ulkon�k�"
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Kirjoita viesti"
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Tausta:"
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr ""
 
-#: executive-summary/component/main.c:62
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+#: composer/evolution-composer.c:374
+msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
+#: data/evolution.keys.in.h:1
+msgid "address card"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testaa bonobo-palvelua"
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testaa palvelua"
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Virhe"
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "P�ivit� automaattisesti"
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "P�ivit� heti"
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "P�ivit� joka"
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuutti"
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "vuosi"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "vuotta"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "kuukausi"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "viikko"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "viikkoa"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "p�iv��"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "tunti"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "tuntia"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuutti"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunti"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekuntia"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Hups. Olet unohtanut valita p�iv�n."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hups. Olet valinnut ep�kelvon p�iv�n."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5135,28 +5867,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "nyt"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5179,8 +5919,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr ""
 
@@ -5192,46 +5932,6 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr ""
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr ""
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Tulevat"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "L�htev�t"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr ""
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5251,36 +5951,87 @@ msgstr "S��nn�n nimi: "
 msgid "Untitled"
 msgstr "Nimet�n"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "kaikki ehdot t�ytet��n"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "mik��n ehdoista t�yttyy"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Lis�� ehto"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "l�htev�t"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Lis��"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr ""
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Tulevat"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "L�htev�t"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr ""
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr ""
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
@@ -5356,90 +6107,91 @@ msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "V�lit� osoitteeseen"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Viesti l�hetetty"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Siirr� kansioon"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Lue"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1086
+#: 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:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "L�hett�j�"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr ""
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Koko"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
@@ -5460,7 +6212,8 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1087
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Aihe"
 
@@ -5488,188 +6241,269 @@ msgstr "Muokkaa s��nt��"
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "S�hk�posti"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution on l�yt�nyt Elmin s�hk�postitiedostoja.\n"
+"Haluatko tuoda n�m� postit Evolutioniin?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Elm-s�hk�posti"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Lis�� osoitekirja"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution on l�yt�nyt Elmin s�hk�postitiedostoja.\n"
+"Haluatko tuoda n�m� postit Evolutioniin?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Asetukset..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: 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:691
+msgid "Pine mail"
+msgstr "Pine-s�hk�posti"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr ""
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Ominaisuudet..."
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr ""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr ""
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:576 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:579 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:582 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:585 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:591
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:609
-msgid "_Open"
-msgstr "_Avaa"
-
-#: mail/folder-browser.c:611
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "L�het� uudelleen"
 
-#: mail/folder-browser.c:613 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
-#: mail/folder-browser.c:615 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:622 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Vastaa _kaikille"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Vastaa _kaikille"
 
-#: mail/folder-browser.c:624 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:626
-msgid "Forward _inline"
-msgstr ""
-
-#: mail/folder-browser.c:629 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:631 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Merkitse luke_mattomaksi"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Merkitse luke_mattomaksi"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:642 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Lis�� osoitekirja"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr ""
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution on l�yt�nyt Elmin s�hk�postitiedostoja.\n"
-"Haluatko tuoda n�m� postit Evolutioniin?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm-s�hk�posti"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
@@ -5686,22 +6520,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine-s�hk�posti"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -5733,37 +6551,69 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
+#: 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 "Et ole t�ytt�nyt kaikkia tarvittavia kohtia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolutionin tilimuokkain"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Allekirjoitustiedosto:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"T�t� viesti� ei ole l�hetetty.\n"
+"\n"
+"Haluatko tallentaa muutokset?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (oletus)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "�l� k�yt�"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "K�yt�"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Palauta"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "T�m� on oletustilini"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolutionin tilienhallinta"
 
@@ -5827,38 +6677,46 @@ msgstr ""
 "Viestill� ei ole aihetta.\n"
 "L�hetet��nk� toedella?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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�."
+msgstr ""
+"Sinuun tulee m��ritell� vastaanottajat ennen t�m�n viestin l�hett�mist�."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 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:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s %s kirjoitti:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "V�litetty viesti:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5866,7 +6724,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5874,54 +6732,48 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Haluatko todella poistaa teht�v�n '%s'?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Kirjoita tiedoston yli?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Saman niminen tiedosto on jo olemassa.\n"
-"Kirjoitetaanko sen yli?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "S_uodattimet..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -5953,10 +6805,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr ""
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Tarkista tuetut tavat "
@@ -5966,34 +6822,63 @@ msgid " color"
 msgstr " "
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Tilit"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Liite"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Tarkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Kirjoita"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6003,716 +6888,856 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Muokkaa..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "S�hk�postiosoite:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "K�yt�"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Allekirjoitustiedosto:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Korosta lainaukset v�rill� "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+msgid "Mailbox location"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "T�m� on oletustilini"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Merkitse viestit luetuiksi kun on kulunut:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP-palvelin"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisaatio:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Valitse v�ri"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+msgid "Quoted"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Otetaan vastaan s�hk�postia"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "Turvalli_suus"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "L�het� s�hk�postit oletuksena HTML-muodossa."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "L�htev� posti"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "L�hetetyt"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "L�hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Palvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "L�hteet"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Pakolliset tiedot"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "L�hteet"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tyyppi"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "K�yt� salattua yhteytt� (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "K�ytt�j�tunnus:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
-msgstr "Tallenna liite"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "sekuntia."
 
-#: mail/mail-display.c:295
-msgid "Save to Disk..."
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Putken luonti ep�onnistui: %s"
+
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Hakemistoa %s ei voitu luoda:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:221
+msgid "Save Attachment"
+msgstr "Tallenna liite"
+
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
+msgstr ""
+
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Ulkoinen katselin"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Ulkoinen katselin"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Ladataan viestin sis�lt��"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopioi sijainti"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Tallenna nimell�"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Kopioi sijainti"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Tallenna nimell�..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d sekuntia"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Ladataan viestin sis�lt��"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "P�iv�ys"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "S�hk�postiosoite:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "L�hett�j�"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Vastaanottaja"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Kopiot:"
+
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Luodaan uutta kansiota"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Kopioidaan viestej�"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Et voi kopioida viestej� t�st� roskakorista."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Aseta %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "L�hetet��n viesti�"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "L�hetet��n viesti� %d / %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Siirret��n"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Roskakori"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Muistutukset"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Luodaan uutta kansiota"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Haetaan viestej�"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan viestej�"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Etsi"
-
-#: mail/mail-search.c:167
+#: mail/mail-ops.c:2101
 #, c-format
-msgid "Search \"%s\""
-msgstr "Etsi \"%s\""
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "Etsi viesti� jolla ei ole aihetta"
 
-#: mail/mail-search.c:169
-msgid "Search Untitled Message"
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
 msgstr "Etsi viesti� jolla ei ole aihetta"
 
-#: mail/mail-search.c:184
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Muokkaa viesti�"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Muokkaa viesti�"
+
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkityst�"
 
-#: mail/mail-search.c:185
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:192
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Polku:"
+
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "L�het� & Vastaanota postia"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Otetaan vastaan"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "P�ivitet��n..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "L�hetet��n"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (v�litetty viesti)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "V�litetty viesti - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "V�litetty viesti (ei aihetta)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "V�litetyt viestit"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "V�litetyt viestit"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr ""
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Vastaa"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "Vastaa t�m�n viestin l�hett�j�lle"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "Vastaa kaikille t�m�n viestin vastaanottajille"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "V�lit�"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "V�lit� t�m� viesti"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Tulosta valittu viesti"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Poista t�m� viesti"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Edellinen"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Edellinen viesti"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seuraava"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Seuraava viesti"
-
-#: mail/message-list.c:682
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "N�hty"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "N�kem�tt�"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:686
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:690
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:695
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:696
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "T�n��n %l:%M %p"
 
-#: mail/message-list.c:962
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:974
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:982
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Tallennetaan viestej�"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1087
-msgid "From"
-msgstr "L�hett�j�"
-
-#: mail/message-list.c:1087
-msgid "Date"
-msgstr "P�iv�ys"
-
-#: mail/message-list.c:1087
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.c:1088
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: mail/message-list.c:1088
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Koko"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr ""
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Kansio"
 
@@ -6740,42 +7765,1461 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Tapaamiset"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "N�yt� tapaamiset"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Ei kuvausta"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "%s - Evolution %s"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Virhe ladattaessa kalenteria</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "N�yt� teht�v�t"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Muistutukset"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Viestin tulostus ep�onnistui"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr ""
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "�l� k�yt�"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Portti:"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Liit�"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "L�hteet"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "kuukausi"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Matalin"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Ke"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Matalin"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "N�yt�"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Kuvaus sis�lt��"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Etsi uudelleen"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "nyt"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "P�ivit� heti"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Kuvaus sis�lt��"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "S�hk�posti"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "N�yt� kaikki"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Ensisijainen s�hk�posti"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Tuleva posti"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Tuntematon todennustila."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Tuntematon virhe"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Neiti"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Pysty"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Sulje t�m� ikkuna"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "N�yt� teht�v�t"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Sulje t�m� ikkuna"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "L�het�"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Yl�tunniste:"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "p�iv��"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Elokuu"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Vastattu"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Kansiot"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Lis�� toiminto"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Luonnoskansio:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "N�yt� asetukset"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Perjantai"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Keskiviikko"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "kuukausi"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 viikko"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "N�yt� teht�v�t"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "N�yt� teht�v�t"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Teht�v�t"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Yksikk�: "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Muut"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Huhtikuu"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr ""
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Yksityiskohtaiset"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Peruuta tapaaminen"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Erikoiskansiot"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "T�m� n�ytt�isi olevan ensimm�inen kerta kun k�yt�t Evolutionia."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Paina \"OK\" asentaaksesi Evolutionin k�ytt�j�kohtaiset tiedostot kohteeseen"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6786,14 +9230,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
+msgstr "Virhe luettaessa tiedostoa."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6801,7 +9245,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6809,320 +9262,481 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Kopioi kansioon"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Siirr� kansioon"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Poista %s:n p�iv�n kuluttua"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Haluatko todella poistaa teht�v�n '%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Nimet�n)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Virhe %s:n k�ynnistyksess�"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Virhe %s:n lataamisessa"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Tiedostonimi:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tiedoston tyyppi:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Valitse tiedosto"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "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:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Luo uusi kontakti"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Virhe tallennettaessa oikoteit�."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr ""
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Ryhm�n nimi:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "�l� poista"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "_Piilota oikotiepalkki"
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Uusi ryhm�..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Poista t�m� ryhm�..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Poista t�m� ryhm�..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Poista t�m� oikotie oikotiepalkista"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Aktivoi"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Piilota oikotiepalkki"
+
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Avaa"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Avaa valittu viesti uudessa ikkunassa"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "S��nn�n nimi: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Piilota oikotiepalkki"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista t�m� oikotie oikotiepalkista"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Virhe tallennettaessa oikoteit�."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Oikotiepalkki"
+
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontakti"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Ei nime�)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
-msgid "_View"
-msgstr "_N�yt�"
-
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Kansion nimi:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Kansion tyyppi:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr ""
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
+#: shell/e-task-widget.c:168
 #, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+msgid "%s (...)"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr ""
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Mik� tahansa kentt� sis�lt��"
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Virhe %s:n k�ynnistyksess�"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Virhe %s:n lataamisessa"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Is�nt�palvelin:"
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Tiedostonimi:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Valitse tiedosto"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Kansion nimi:"
 
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tiedoston tyyppi:"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Kansion tyyppi:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -7144,32 +9758,41 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "�l� poista"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7177,236 +9800,321 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+msgid "Cannot access the Evolution shell."
 msgstr ""
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttij�rjestelm�n alustus ep�onnistui"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopioi"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Poista kontakti"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Etsi"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Leikkaa"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Etsi kontakti"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Poista kontakti"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Esikatsele tulostettavaa viesti�"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Uusi s�hk�posti"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Liit�"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Liit� leikep�yt�"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Esikatselee tulostettavaa kalenteria"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Poista kontakti"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Pys�yt�"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Pys�yt� lataaminen"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "N�yt� kaikki"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "N�yt� kaikki kontaktit"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Osoitekirjan l�hteet..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Kontakti"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Valitse k_aikki"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "T_y�kalut"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 p�iv��"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Muuta asetuksia"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Luo uusi koko p�iv�n tapahtuma"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Luo uusi tapaaminen"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Luo uusi kalenteri"
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "P�iv�"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Siirry"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Siirry nykyiseen aikaan"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Kuukausi"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Avaa kalenteri"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr ""
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Uusi tapaaminen"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Tulosta kalenteri"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Tulosta t�m� kalenteri"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Tallenna nimell�"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Pakolliset tiedot"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "N�yt� 1 p�iv�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "N�yt� 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "N�yt� 1 viikko"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "N�yt� ty�viikko"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "T�n��n"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Ty�viikk_o"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Viikko"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Tapaaminen"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_P�iv�"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Kuukausi"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_Uusi"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Avaa kalenteri"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Viikko"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Sulje"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Sulje t�m� tapaaminen"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Poista t�m� tapaaminen"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Esikatsele tulostettavaa viesti�"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Tulostuksen esikatselu"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Tulostusasetukset"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Tulosta t�m� kohta"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Tulosta..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Tallenna ja sulje"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "T_oiminnot"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Tiedosto"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Poista t�m� kohta"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Poista..."
 
@@ -7418,27 +10126,12 @@ msgstr "Ohje"
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Tulosta t�m� kohta"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Tulosta..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Tallenna _nimell�..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Tallenna ja sulje"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
@@ -7455,883 +10148,993 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "L�het� _viesti kontaktille..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Tietoja t�st� sovelluksesta"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Poista t�m� kohta"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Tietoja..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Tallenna teht�v� ja sulje ikkuna"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "T_oiminnot"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "L�het� _viesti kontaktille..."
+
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "L�het� _viesti kontaktille..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Osoitekirja..."
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Peruuta tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "L_eikkaa"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Ladataan kalenteria"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "V�lit� t�m� viesti"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "Peruuta tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Sulje t�m� tapaaminen"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kopioi kansioon..."
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopioi"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "T_oiminnot"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Leikkaa"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Peruutettu"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Tallenna nykyinen tiedosto"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Poista t�m� tapaaminen"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Kirjoita"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Kirjoita uusi viesti"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Siirry seuraavaan kohtaan"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "_Unohda salasanat"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Siirry edelliseen kohtaan"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Seuraava"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Liit�"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "L�het� / Vastaanota"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Liit� leikep�yt�"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Edellinen"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Tulostuksen esikatselu"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Tulost_usasetukset"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Tulostusasetukset"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "S_uodattimet..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Tallenna"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_S�hk�postiasetukset..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Tallenna nykyinen tiedosto"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Esikatselu:"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_L�het� / Vastaanota"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Valitse kaikki"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Poista valitut viestit"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Merkitsee kaikki valituksi"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Poista valitut viestit"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Piilota valitut vi_estit"
+
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Piilota _poistetut viestit"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Piilota _luetut viestit"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Tietoja..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
-msgid "_Close"
-msgstr "_Sulje"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:31
-msgid "_Contact (FIXME)"
-msgstr "_Kontakti"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Liit� leikep�yt�"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopioi"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Valitse _kaikki"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_Ohje"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Valitse _s�ie"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Poista valitut viestit"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "N�yt� k_aikki"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Siirr� kansioon..."
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Poista valitut viestit"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "S�ikeistetty viesti-ikkuna"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "L_iit�"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Kansio"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_K��nn� valinta"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Valitse k_aikki"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "S�ikeistetty viesti-ikkuna"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:44
-msgid "_Task (FIXME)"
-msgstr "_Teht�v�"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Poista valitut viestit"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Vastaa kaikille t�m�n viestin vastaanottajille"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Lis�� palvelu"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Vastaa t�m�n viestin l�hett�j�lle"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Luo uusi s�hk�posti"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Uusi s�hk�posti"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Kirjoita"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Kirjoita uusi viesti"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Kansion asetukset..."
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Kopioi viesti uuteen kansioon"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Kopioi valitut viestit uuteen kansioon"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Vastaa t�m�n viestin l�hett�j�lle"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Siirry seuraavaan viestiin"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Poista valitut viestit"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Muokkaa viesti�"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Muokkaa valittua viesti�"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Siirry edelliseen viestiin"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Siirry edelliseen viestiin"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Siirry edelliseen viestiin"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Suodata post-ituslistan mukaan"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "_Unohda salasanat"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "V�lit�"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "T�ydet _otsikkotiedot"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Siirry seuraavaan viestiin"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Siirry edelliseen viestiin"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Piilota poistetut viestit"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "V�lit�"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "Piilota valitut vi_estit"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "V�lit�"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "Piilota _poistetut viestit"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "Piilota _luetut viestit"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "K��nn� valinta"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Merkitse ka_ikki luetuksi"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "V�litetyt viestit"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Merkitse luetuksi"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Merkitse valitut viestit lukemattomiksi"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Siirr�"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Siirr� viesti uuteen kansioon"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Avaa uudessa ikkunassa"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Seuraava"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Valitse _s�ie"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Tulostuksen esikatselu viestist�..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Tulosta viesti tulostimella"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Esikatsele tulostettavaa viesti�"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Tulosta viesti..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Edellinen"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Edellinen viesti"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Vastaa kaikille"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Edellinen viesti"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Vastaa l�hett�j�lle"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Edellinen viesti"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "_Etsi viesti�"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Tulosta viesti..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "_L�hde"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Tulostuksen esikatselu"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Tallenna viesti uuteen tiedostoon"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Tulosta viesti"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Vastaa"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "Valitse _s�ie"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Vastaa kaikille"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "L�het� / Vastaanota"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "_Etsi viesti�"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Tallenna viesti uuteen tiedostoon"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"l�het� jonossa olevat viestit\n"
-"    ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "T�ydet _otsikkotiedot"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "N�yt� k_aikki"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Ajan tulee olla muodossa: %s"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "S�ikeistetty viesti-ikkuna"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Etsi uusia viestej� kaikista kansioista"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Lis�� viestiin liitetiedoston"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Palauta"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Suodata post-ituslistan mukaan"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "Suodata _l�hett�j�n mukaan"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Suodata _vastaanottajien mukaan"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Suodata _aiheen mukaan"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Liite"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Kopioi kansioon"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Luo viestist� suodatin"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "S_uodattimet..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:34
-msgid "_Folder"
-msgstr "_Kansio"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "V�litetyt viestit"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Viestit"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_K��nn� valinta"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Siirr� kansioon"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "_S�hk�postiasetukset..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "L�het� viestej� _uudelleen"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "L�het� viestej� _uudelleen"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Sulje t�m� ikkuna"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Vastaa"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Mukauta t_y�kalupalkkeja..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "L�het� viestej� _uudelleen"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Mukauta"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "_Tallenna viesti nimell�..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Mukauta ty�kalupalkkeja"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "_L�het� / Vastaanota"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Sulje"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_S�ikeistys"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_N�yt�"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Liit�"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Poista kontakti"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Salaa t�m� viesti PGP:ll�"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Liit� tekstitiedosto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Liit� tiedosto viestiin tekstin�"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Liit� tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Avaa tiedosto"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP-salaus"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP-allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr ""
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP-salaus"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Tallenna _kansioon..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Tallenna"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Tallenna nimell�"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Tallenna nykyinen tiedosto"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimell�"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "L�het�"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "L�het� _my�hemmin"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "L�het� _my�hemmin"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "L�het� viesti HTML-muodossa"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "L�het� viesti my�hemmin"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "L�het� viesti heti"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "L�het� viesti heti"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "N�yt� / piilota liitetiedostot"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "N�yt� _liitteet"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "N�yt� liitteet"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Allekirjoita viesti PGP-avaimellasi"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "M��ritt�� n�ytet��nk� L�hett�j�-kentt�"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "M��ritt�� n�ytet��nk� Vastausosoite-kentt�"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Liite"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Poista"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Li_s��"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Liit� tekstitiedosto..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kentt�"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "Turvalli_suus"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Ohje"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Tilaa"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Etsi uudelleen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Tee uudelleen"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Tee kumottu toiminto uudelleen"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Korvaa"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Korvaa merkkijono"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Vastaa kaiki_lle"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Uusi teht�v�"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Poista teht�v�"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Tallenna teht�v� ja sulje ikkuna"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Etsi uudelleen samaa merkkijonoa"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Etsi merkkijonoa"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Kumoa"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Kumoa edellinen toiminto"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
-msgid "_Appointment (FIXME)"
-msgstr "_Tapaaminen"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Vastaa"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Kopioi valinta"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Luo uusi teht�v�"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Poista teht�v�"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Poista teht�v�"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Uusi teht�v�"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Liit� leikep�yt�"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Teht�v�asetukset"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_S�hk�postiasetukset..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Teht�v�"
 
@@ -8339,146 +11142,218 @@ msgstr "_Teht�v�"
 msgid "About Evolution..."
 msgstr "Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Sulje t�m� ikkuna"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Mukauta t_y�kalupalkkeja..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Mukauta"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Mukauta ty�kalupalkkeja"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Kopioi kansioon"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Luodaan uutta kansiota"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Poista t�m� oikotie oikotiepalkista"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Luodaan uutta kansiota"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Poista t�m� kohta"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution _Window"
-msgstr ""
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
+#: ui/evolution.xml.h:17
+msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr ""
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Avaa valittu viesti uudessa ikkunassa"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "L�het� virheraportti"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "L�het� _virheraportti"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "L�het� virheraportti k�ytt�en Bug Buddy:a."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "M��rit�, n�ytet��nk� kansiopalkki"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "M��rit�, n�ytet��nk� oikotiepalkki"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "M��rit�, ty�skennell��nk� poissa linjoilta."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Kalenterin k�ytt�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:26
-msgid "Work Offline"
-msgstr "Ty�skentele poissa linjoilta"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:28
-msgid "_Actions"
-msgstr "T_oiminnot"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Tapaaminen"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontakti"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopioi"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Siirr�"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Uusi"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Avaa..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Oikotiepalkki"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Teht�v�"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
 msgstr ""
 
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Osoite _2:"
+
 #: views/addressbook/galview.xml.h:2
 msgid "By Company"
 msgstr "Yrityksen mukaan"
@@ -8507,9 +11382,12 @@ msgstr "Viestit"
 msgid "With Category"
 msgstr "Ryhm�n mukaan"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8583,69 +11461,138 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Nykyinen n�kym�"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "T�n��n"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "viikko"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Roskakori"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr ""
+"\n"
+"  Muut nimet: "
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "_Uusi"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Tuntematon virhe: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Muut"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Kontaktinhallinta"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Tallenna nimell�..."
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "N�yt� kaikki"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Muokkaa..."
-
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr ""
@@ -8658,6 +11605,10 @@ msgstr "Tiedoksi"
 msgid "Warning"
 msgstr "Varoitus"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Virhe"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Kysymys"
@@ -8694,3 +11645,342 @@ msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Muuta asetuksia"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Teht�v�asetukset"
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontaktit..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Yritys:"
+
+#~ msgid "Find..."
+#~ msgstr "Etsi..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Avaa kalenteri"
+
+#~ msgid "Save calendar"
+#~ msgstr "Tallenna kalenteri"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tueta"
+
+#~ msgid "Colors"
+#~ msgstr "V�rit"
+
+#~ msgid "Highlight"
+#~ msgstr "Korosta"
+
+#~ msgid "Work week"
+#~ msgstr "Ty�viikko"
+
+#~ msgid "Edit Task"
+#~ msgstr "Muokkaa teht�v��"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Muokkaa t�t� teht�v��..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Muokkaa teht�v��"
+
+#~ msgid "Go to Today"
+#~ msgstr "Siirry t�h�n p�iv��n"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "En pystynyt lataamaan kalenteritiedostoasi!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "En pystynyt lukemaan kalenteritiedostoasi!\n"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Lis�� kalenteriin"
+
+#~ msgid "Update Calendar"
+#~ msgstr "P�ivit� kalenteri"
+
+#~ msgid "Attendee address"
+#~ msgstr "Osanottajan osoite"
+
+#~ msgid "Attendees: "
+#~ msgstr "Osanottajat: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Peruuta\n"
+#~ "tapaaminen"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Alkamisp�iv�:"
+
+#~ msgid "Summary contains"
+#~ msgstr "Yhteenveto sis�lt��"
+
+#~ msgid "Comment contains"
+#~ msgstr "Kommentti sis�lt��"
+
+#~ msgid "Has category"
+#~ msgstr "Sis�lt�� ryhm�n"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Se ei ole tavallinen tiedosto."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen ep�onnistui."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Tiedosto on hyvin suuri (yli 100K).\n"
+#~ "Haluatko varmasti liitt�� sen?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML-tiedostoa ei voitu avata:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "Valitse palvelu"
+
+#~ msgid "Run %s"
+#~ msgstr "Suorita %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Sulje %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Siirr� %s vasemmalle"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Siirr� %s oikealle"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Siirr� %s edelliselle riville"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Siirr� %s seuraavalle riville"
+
+#~ msgid "Appearance"
+#~ msgstr "Ulkon�k�"
+
+#~ msgid "Background:"
+#~ msgstr "Tausta:"
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Testaa bonobo-palvelua"
+
+#~ msgid "Test service"
+#~ msgstr "Testaa palvelua"
+
+#~ msgid "Update automatically"
+#~ msgstr "P�ivit� automaattisesti"
+
+#~ msgid "Forward to Address"
+#~ msgstr "V�lit� osoitteeseen"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopioidaan viestej�"
+
+#~ msgid "Search \"%s\""
+#~ msgstr "Etsi \"%s\""
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (v�litetty viesti)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "V�litetty viesti (ei aihetta)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Tulosta valittu viesti"
+
+#~ msgid "Activate"
+#~ msgstr "Aktivoi"
+
+#~ msgid "Find"
+#~ msgstr "Etsi"
+
+#~ msgid "Find a contact"
+#~ msgstr "Etsi kontakti"
+
+#~ msgid "View All"
+#~ msgstr "N�yt� kaikki"
+
+#~ msgid "View all contacts"
+#~ msgstr "N�yt� kaikki kontaktit"
+
+#~ msgid "5 Days"
+#~ msgstr "5 p�iv��"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Luo uusi kalenteri"
+
+#~ msgid "Day"
+#~ msgstr "P�iv�"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Avaa kalenteri"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Avaa kalenteri"
+
+#~ msgid "About this application"
+#~ msgstr "Tietoja t�st� sovelluksesta"
+
+#~ msgid "About..."
+#~ msgstr "Tietoja..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "T_oiminnot"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Osoitekirja..."
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Kopioi kansioon..."
+
+#~ msgid "Go to the next item"
+#~ msgstr "Siirry seuraavaan kohtaan"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Siirry edelliseen kohtaan"
+
+#~ msgid "N_ext"
+#~ msgstr "_Seuraava"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Edellinen"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Tulost_usasetukset"
+
+#~ msgid "Select everything"
+#~ msgstr "Merkitsee kaikki valituksi"
+
+#~ msgid "_About..."
+#~ msgstr "_Tietoja..."
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Siirr� kansioon..."
+
+#~ msgid "Add Service"
+#~ msgstr "Lis�� palvelu"
+
+#~ msgid "Create a new email"
+#~ msgstr "Luo uusi s�hk�posti"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Kansion asetukset..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopioi viesti uuteen kansioon"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Muokkaa valittua viesti�"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Piilota poistetut viestit"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Merkitse luetuksi"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Merkitse luke_mattomaksi"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Siirr� viesti uuteen kansioon"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Tulostuksen esikatselu viestist�..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Tulosta viesti tulostimella"
+
+#~ msgid "Reply to all"
+#~ msgstr "Vastaa kaikille"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Vastaa l�hett�j�lle"
+
+#~ msgid "S_ource"
+#~ msgstr "_L�hde"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "l�het� jonossa olevat viestit\n"
+#~ "    ja hae uudet viestit"
+
+#~ msgid "_Reply"
+#~ msgstr "_Vastaa"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Tallenna viesti nimell�..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_S�ikeistys"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Tallenna _kansioon..."
+
+#~ msgid "Send the message now"
+#~ msgstr "L�het� viesti heti"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Liit� tekstitiedosto..."
+
+#~ msgid "Redo"
+#~ msgstr "Tee uudelleen"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Tee kumottu toiminto uudelleen"
+
+#~ msgid "Replace"
+#~ msgstr "Korvaa"
+
+#~ msgid "Replace a string"
+#~ msgstr "Korvaa merkkijono"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Vastaa kaiki_lle"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Etsi uudelleen samaa merkkijonoa"
+
+#~ msgid "Search for a string"
+#~ msgstr "Etsi merkkijonoa"
+
+#~ msgid "Undo"
+#~ msgstr "Kumoa"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Kumoa edellinen toiminto"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Vastaa"
diff --git a/po/fr.po b/po/fr.po
index 2b910af395..dba4a9b60c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-02-13 13:03+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -14,11 +14,19 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Carte : "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +34,7 @@ msgstr ""
 "\n"
 "Nom : "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +42,7 @@ msgstr ""
 "\n"
 "  Pr�fixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +50,7 @@ msgstr ""
 "\n"
 "  Donn� :      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +58,7 @@ msgstr ""
 "\n"
 "  Additionnel : "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "  Famille :     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +74,7 @@ msgstr ""
 "\n"
 "  Suffixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +82,7 @@ msgstr ""
 "\n"
 "Date de naissance : "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +90,7 @@ msgstr ""
 "\n"
 "Addresse :"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +98,7 @@ msgstr ""
 "\n"
 "  Boite postale :  "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext :         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +114,7 @@ msgstr ""
 "\n"
 "  Rue :      "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +122,7 @@ msgstr ""
 "\n"
 "  Ville :        "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +130,7 @@ msgstr ""
 "\n"
 "  R�gion :      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +138,7 @@ msgstr ""
 "\n"
 "  Code postal : "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +146,7 @@ msgstr ""
 "\n"
 "  Pays :     "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +154,7 @@ msgstr ""
 "\n"
 "D�nomination : "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +162,7 @@ msgstr ""
 "\n"
 "T�l�phones :\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +170,7 @@ msgstr ""
 "\n"
 "T�l�phone :"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +178,7 @@ msgstr ""
 "\n"
 "Adresse �lectronique :\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +186,7 @@ msgstr ""
 "\n"
 "Adresse �lectronique 2 :"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +194,7 @@ msgstr ""
 "\n"
 "Messager : "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +202,7 @@ msgstr ""
 "\n"
 "Fuseau horaire : "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +210,7 @@ msgstr ""
 "\n"
 "Situation g�ographique : "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +218,7 @@ msgstr ""
 "\n"
 "Profession : "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +226,7 @@ msgstr ""
 "\n"
 "Org : "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +234,7 @@ msgstr ""
 "\n"
 "  Nom :  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +242,7 @@ msgstr ""
 "\n"
 "  Unit� :  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +250,7 @@ msgstr ""
 "\n"
 "  Unit� 2 : "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +258,7 @@ msgstr ""
 "\n"
 "  Unit� 3 : "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +266,7 @@ msgstr ""
 "\n"
 "  Unit� 4 : "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +274,7 @@ msgstr ""
 "\n"
 "Cat�gories : "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +300,7 @@ msgstr ""
 "\n"
 "Cha�ne unique : "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -300,23 +308,25 @@ msgstr ""
 "\n"
 "Cl� publique : "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Messages multiple"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Entrer le mot de passe pour %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
@@ -329,14 +339,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non charg�\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Ne peut d�marrer le serveur wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Ne peut d�marrer wombat"
 
@@ -345,740 +355,863 @@ msgstr "Ne peut d�marrer wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conduit 'Contact' d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Serveur LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fichier"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Type de carnet d'adresses inconnu"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Aucun (mode anonyme)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Mot de passe"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Type d'identification inconnu"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Un"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Sous-arborescence"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Type de domaine inconnu"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Se souvenir de ce mot de passe"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "H�te :"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Racine DN :"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port :"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Domaine de recherche :"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Identification :"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Chemin :"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Cr�er le chemin si il n'existe pas."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "�diter le carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Ajouter un carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"S�lectionnez le type de carnet d'adresse que vous avez, et entrez les "
+"informations le concernant."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nom :"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Description :"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Ajouter"
+msgid "Addressbook Sources"
+msgstr "Sources du carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Supprimer"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nom"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_�dition"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Autres contacts"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Entrer le mot de passe pour %s"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Impossible d'ouvrir le carnet d'adresses"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "N'importe quel champ contient"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Le nom contient"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "L'e-mail contient"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Le nom contient"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que le navigateur de dossier affichera"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "E-mail principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "S�lectionner un fichier"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Cr�er un nouveau contact"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "�diter le carnet d'adresses"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Autres contacts"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Adresse �lectronique :"
+
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Cat�gories disponibles : "
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conduit 'Contact' d'Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Enlever"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Enlever"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Envoie du message"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Autres contacts"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinataires du message"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "S�lectionnez des noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "S�lectionnez un nom depuis :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Cat�gorie :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Rechercher"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Anni_verssaire :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_ravail"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax travail"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacts..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_t�gories..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "�diteur de contacts"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "D�tails"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Classer comme :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "G�n�ral"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nouveau type de t�l�phone"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tes :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation :"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Types de t�l�phones"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "E-mail principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Veut recevoir des messages _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Page Web :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nom de l'_assistant :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Date de naissance :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Travail"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "So_ci�t� :"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contacts..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_D�partement :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nom complet..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Maison"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Profession :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "No_m du directeur :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobile"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Sur_nom :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profession :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Conjoint(e) :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_C'est l'adresse de la liste de diffusion"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "�lement(s) appartenant � ces cat�gories : "
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistant"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Travail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "R�pondeur"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Voiture"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Soci�t�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Maison 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RNIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobile"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Fax autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 #, fuzzy
 msgid "Edit Full"
 msgstr "�diter les Filtres"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet :"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 #, fuzzy
 msgid "E-mail"
 msgstr "Adresse �lec."
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2 :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Pa_ys :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlande"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Ville :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Bo�te _postale :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "�tat/_Province :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Code postal :"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "V�rifier le nom complet"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 #, fuzzy
 msgid "I"
 msgstr "Si"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "est"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Pr�nom :"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nom :"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Second pr�no_m :"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Suffixe :"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Comme _minicartes"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Comme _tableau"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entrer le mot de passe pour %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Impossible d'ouvrir le carnet d'adresses"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Il nous est impossible d'ouvrir ce carnet d'adresses. Soit\n"
-"parce que vous avez entrez une URI incorrecte, soit\n"
-"parce que vous avez essayer d'acc�der � un serveur LDAP\n"
-"et que le support LDAP n'a pas �t� compil�. Si vous avez\n"
-"entr� une URI, v�rifiez sa validit� et r�entrez la. Sinon\n"
-"vous essayer probablement d'acc�der � un serveur LDAP,\n"
-"vous devriez t�l�charger et installer OpenLDAP, puis\n"
-"recompiler et installer Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Afficher tout"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avanc�e..."
-
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
-msgstr "N'importe quel champ contient"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Le nom contient"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "L'e-mail contient"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que le navigateur de dossier affichera"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Autres contacts"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Serveur LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fichier"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Type de carnet d'adresses inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Aucun (mode anonyme)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Mot de passe"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Type d'identification inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Un"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Sous-arborescence"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Type de domaine inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Se souvenir de ce mot de passe"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "H�te :"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Port :"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Racine DN :"
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Domaine de recherche :"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Identification :"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Chemin :"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Cr�er le chemin si il n'existe pas."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "�diter le carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Ajouter un carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"S�lectionnez le type de carnet d'adresse que vous avez, et entrez les "
-"informations le concernant."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nom :"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Description :"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Sources du carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Supprimer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "�diter"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Disable Queries"
-msgstr "Cat�gories disponibles : "
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
+msgid "List _name:"
+msgstr "Nom d'h�te :"
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Add to Contacts"
-msgstr "Autres contacts"
+msgid "Members"
+msgstr "D�cembre"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: 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 ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Enlever"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+msgid "contact-list-editor"
+msgstr "�diteur de contacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Conduit 'Contact' d'Evolution"
+msgid "Contact List Editor"
+msgstr "�diteur de contacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Cliquez ici pour le carnet d'adresses"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Cliquez ici pour le carnet d'adresses"
+msgid "New Contact:"
+msgstr "Nouveau contact"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+msgid "Original Contact:"
+msgstr "Auteur originel : "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Cliquez ici pour le carnet d'adresses"
+#: 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?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Conduit 'Contact' d'Evolution"
+msgid "Changed Contact:"
+msgstr "Autres contacts"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Enlever"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
 #, fuzzy
-msgid "Remove All"
-msgstr "Enlever"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Rechercher..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinataires du message"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "S�lectionnez des noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "S�lectionnez un nom depuis :"
+msgid "_Change Anyway"
+msgstr "Changer"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1190,174 +1323,269 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Envoie un _message au contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimer une en_veloppe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Sources"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Travail en cours"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permission refus�e"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Fichier introuvable"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Op�ration non support�e"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Annul�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erreur d'E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Erreur de lecture du fichier de courrier : %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Classer comme :"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Adresse �lec."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistant"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "R�pondeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Soci�t�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Mobile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Autres contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "D�partement"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Fait"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Chargement du calendrier"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1401,7 +1629,8 @@ msgid "Dimensions:"
 msgstr "Dimensions :"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Police..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1461,7 +1690,6 @@ msgid "Margins"
 msgstr "Marges"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
@@ -1541,142 +1769,328 @@ msgstr "Type :"
 msgid "Width:"
 msgstr "Largeur :"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Police..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ne peut lire le bloc d'application � � faire � du Pilot"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Fichier introuvable"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conduite � Calendrier � d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+"Utilitaire de configuration pour la conduite � Calendrier � d'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+"Utilitaire de configuration pour la conduite � Calendrier � d'Evolution.\n"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Afficher les informations concernant Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarme le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Fermer"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Sieste"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Dur�e de la sieste (minutes)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "�diter le rendez-vous"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Aucun r�sum� disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Rappel de votre rendez-vous � "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Sieste"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Valider"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "Ne peut initialiser GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Ne peut initialiser Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
+
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Ouvrir le calendrier"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Enregistrer le calendrier"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 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 votre configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Haute"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Basse"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaque"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Non d�marr�e"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Compl�t�"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Annul�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1687,23 +2101,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1713,141 +2131,299 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La valeur de pourcentage doit �tre comprise entre 0 et 100 inclus"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Ind�fini"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "R�currence"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigner un score"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "Maintenant"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Carte : "
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semaine de travail"
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erreur de chargement du calendrier</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Semaine"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erreur de chargement du calendrier :<br>M�thode non support�e"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mois"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Affichage"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "L'URI que le calendrier affichera"
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Afficher les rendez-vous"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmes auditives"
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Afficher les t�ches"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinataires du message"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Chargement du calendrier"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Options d'affichage"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "L'URI que le calendrier affichera"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Rappel de votre rendez-vous � "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sieste"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Valider"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Nettoyer l'affichage des messages"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Heure de fin : "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 #, fuzzy
-msgid "Factory for the alarm notification service"
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+msgid "Run program:"
+msgstr "Lancer un programme"
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "jours"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 #, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
+msgid "extra times every"
+msgstr "_Mettre � jour Libre/Occup�"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme le %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "heures"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notification � propos de votre rendez-vous le %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Aucun r�sum� disponible."
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d jours"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Fermer"
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 jour"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "�diter le rendez-vous"
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d semaines"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Dur�e de la sieste (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 semaine"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d heures"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 heure"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutes"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minute"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d secondes"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 seconde"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Affiche le message UID \"%s\""
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "R�cup�ration du courrier depuis %s"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Lancer un programme"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Cr�e un nouveau rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Cr�e un nouveau rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Me rappeler de tous les rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Cr�e un nouveau rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Date &amp; heure"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Alarmes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "R�su_m� :"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Options"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "apr�s"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "avant"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "jour(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "Me rappeler de tous les rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "heure(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minute(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "�diter le rendez-vous"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1878,36 +2454,40 @@ msgid "60 minutes"
 msgstr "60 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Expiration des alarmes apr�s"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes auditives"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Biper quand les fen�tres d'alarme apparaissent."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Pr�f�rences du calendrier"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "�l�ment '� faire' qui finit aujourd'hui :"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Couleurs"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Couleurs pour l'affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Compresser les week-ends"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Options du navigateur de date"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1915,439 +2495,937 @@ msgid "Defaults"
 msgstr "D�fauts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Options d'affichage"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Date d'�ch�ance"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Activer la sonnerie pour"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Fin de la journ�e :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Premier jour de la semaine :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Vendredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Mettre en �vidence"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "�l�ments s'achevant aujourd'hui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "�l�ments expirant aujourd'hui : "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "�l�ments pas encore expir�s"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "�l�ments pas encore expir�s :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Lundi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "�l�ments en retard"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "�l�ments en retard :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Priorit�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "�l�ments en retard"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Me rappeler de tous les rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Alarmes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Samedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Afficher"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Afficher l'heure de fin des rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Afficher les num�ros de semaine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "D�but de la journ�e :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "T�chePad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "T�ches"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "�l�ments s'achevant aujourd'hui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Jeu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Dur�e avant �ch�ance"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Horaire"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisions du temps :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format de date :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Fuseau horaire : "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuelles"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Semaine de travail"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutes avant leur d�but."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "secondes."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "�tes-vous s�r de vouloir supprimer cette t�che sans titre %s ?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "�tes-vous s�r de vouloir supprimer la t�che � %s � ?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "�tes-vous s�r de vouloir supprimer l'entr�e de journal � %s � ?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr " pour "
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Compl�t�"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Compl�t�"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Date d'�ch�ance"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "�diter le rendez-vous"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Rendez-vous - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "T�che - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entr�e de journal - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Aucun r�sum�"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "�craser le fichier ?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Un fichier avec le m�me nom existe.\n"
+"L'�craser ?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Enregistrer sous..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 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:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, 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:91
+#: calendar/gui/dialogs/delete-comp.c:105
 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/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Voulez-vous enregistrer les changements ?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "�tes-vous s�r de vouloir supprimer le rendez-vous � %s � ?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_l�t� :"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "�tes-vous s�r de vouloir supprimer la t�che � %s � ?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "�tes-vous s�r de vouloir supprimer l'entr�e de journal � %s � ?"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "S�lectionner un fichier"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sections :"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuseau horaire : "
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Rendez-vous"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Alarme"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "R�currence"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Annuler la r�union"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Toute la journ�e"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classification"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Date & Time"
 msgstr "Date &amp; heure"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Date d'ach�vement :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_v�"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "En cours"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Date de _d�but :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "R�su_m� :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "T�che"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidentiel"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contacts..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Heure de _fin :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Date d'expiration :"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Heure de _d�but :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Priorit� :"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_�tat :"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Groupe %i"
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
-msgstr "�diter la t�che"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Source"
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
-msgstr "Aucun r�sum�"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendez-vous - %s"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Voiture"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Task - %s"
-msgstr "T�che - %s"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Personnes _n�cessaires"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entr�e de journal - %s"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Cat�gories"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Completion Date"
+msgid "Needs Action"
+msgstr "Supprimer l'action"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "Accepter"
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Refuser"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Essai"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Supprim�"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En cours"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Personnes _n�cessaires"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Personnes _n�cessaires"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Personnes _n�cessaires"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Vu"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Supprimer..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Tout les invit�s"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Compl�t�e"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Date de fin"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Supprim�"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Date de d�but"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Supprim�"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Emplacement g�ographique"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Gestionnaire"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 #, fuzzy
-msgid "Percent complete"
-msgstr "Marque la t�che comme compl�t�e"
+msgid "Member"
+msgstr "D�cembre"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "R�sum�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Transparence"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "�tat"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmes"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Cliquez ici pour ajouter une t�che"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation :"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisation :"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Inviter d'autres personnes..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisation :"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ce rendez-vons contient des r�currences qu'Evolution ne peut �diter."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "le"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "jour"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "dans le"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "i�me"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "occurences"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "R�currence personnalis�e"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Tou(te)s les"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Exceptions"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Aucune r�currence"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Aper�u"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "R�gle de r�currence"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "R�currence simple"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modifier"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "pour"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "toujours"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mois"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "jusqu'�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semaine(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+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 changements ?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Date d'ach�vement :"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Supprim�"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Supprim�"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Aucune"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL :"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "T�che"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_l�t� :"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "En cours"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Date de _d�but :"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Date d'expiration :"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Priorit� :"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_�tat :"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marquer comme termin�e"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marque la t�che comme compl�t�e"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "�diter cette t�che..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "�dite la t�che"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Coller"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marquer comme termin�e"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Supprimer la t�che"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marquer comme termin�e"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Supprime la t�che"
 
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Cliquez ici pour ajouter une t�che"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_l�t� :"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Cat�gories"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Compl�t�"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+#, fuzzy
+msgid "Completion Date"
+msgstr "Compl�t�e"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Date d'�ch�ance"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Date de fin"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Emplacement g�ographique"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Priorit�"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Date de d�but"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "R�sum�"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "T�ches"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparence"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -2355,162 +3433,157 @@ msgstr "%02i divisions de 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 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:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "New Appointment"
+msgid "New _Appointment"
 msgstr "Nouveau rendez-vous"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "New All Day Event"
+msgid "New All Day _Event"
 msgstr "_Toute la journ�e"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "Aller � aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "Aller � la date"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Ouvrir"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 #, fuzzy
-msgid "Delete this Appointment"
+msgid "_Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "S�lectionnez un Dossier"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Rendre ce rendez-vous d�pla�able"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
+msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Je ne peut mettre � jour votre fichier de calendrier !\n"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "Les fichiers d'Evolution sont correctement install�s."
+msgid "This is a meeting request."
+msgstr "_C'est l'adresse de la liste de diffusion"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Je ne peut ouvrir votre fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Je ne peut charger votre fichier de calendrier !\n"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Je ne peut lire votre fichier de calendrier !\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "Ne peut cr�er un calendrier dans `%s'"
+msgid "The message is not understandable."
+msgstr ""
+"Ce message n'a pas de sujet.\n"
+"Voulez-vous vraiment l'envoyer ?"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Component successfully deleted."
-msgstr "Les fichiers d'Evolution sont correctement install�s."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Ajouter au calendrier"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-#, fuzzy
-msgid " Accept "
-msgstr "Accepter"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-#, fuzzy
-msgid " Decline "
-msgstr "Refuser"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
-msgid " Tentative "
-msgstr "Essai"
+msgid "The message does not appear to be properly formed"
+msgstr "Le dossier semble irr�m�diablement corrompu"
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Mettre � jour le calendrier"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Annuler la r�union"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Je ne peut mettre � jour votre fichier de calendrier !\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Je ne peut ouvrir votre fichier de calendrier !\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2526,31 +3599,25 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Calendrier"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
 msgid "Date:"
 msgstr "Date"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Chargement du calendrier"
+
 #: calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
 msgid "Loading calendar..."
 msgstr "Chargement du calendrier"
 
-#: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
-msgid "Organizer:"
-msgstr "Organisation :"
-
 #: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
 msgid "Server Message:"
 msgstr "Enregistrer le message sous..."
 
-#: calendar/gui/e-itip-control.glade.h:11
-#, fuzzy
-msgid "Summary:"
-msgstr "R�su_m� :"
-
 #: calendar/gui/e-itip-control.glade.h:12
 #, fuzzy
 msgid "date-end"
@@ -2560,104 +3627,21 @@ msgstr "Mettre � jour le calendrier"
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Tout les invit�s"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Tout les invit�s"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Tout les invit�s"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-#, fuzzy
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr "Annuler la r�union"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Voiture"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "Heure de _d�but de la r�union :"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Organisation :"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "S�lectionnez un Dossier"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "Personnes _n�cessaires"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "S�lectionnez un Dossier"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
-msgstr "�tat"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Tous"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Cat�gorie :"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger la t�che dans � %s �"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, 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"
@@ -2665,303 +3649,22 @@ msgstr "La m�thode requise pour charger � %s � n'est pas support�e"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "New Appointment..."
+msgid "New _Appointment..."
 msgstr "Nouveau rendez-vous..."
 
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Supprimer toutes les occurences"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Toute la journ�e"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Rendez-vous �l�mentaires"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "R�currence personnalis�e"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Tou(te)s les"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Exceptions"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifier"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Aucune r�currence"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Aper�u"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "R�currence"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "R�gle de r�currence"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Alarme"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
-msgstr "Lancer un programme"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-#, fuzzy
-msgid "Send an email"
-msgstr "R�cup�ration du courrier depuis %s"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "R�glages..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
-msgstr "Afficher un dialogue"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "R�currence simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Heure de _fin :"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Heure de _d�but :"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Date de _d�but :"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
-msgstr "apr�s"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
-msgstr "avant"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "jour(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "end of appointment"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "pour"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "toujours"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "heure(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minute(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mois"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-#, fuzzy
-msgid "start of appointment"
-msgstr "�diter le rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "jusqu'�"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "semaine(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "ann�e(s)"
-
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
-msgstr "�diter le rendez-vous"
-
-#: calendar/gui/event-editor.c:451
-msgid "on"
-msgstr "le"
-
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
-msgstr "jour"
-
-#: calendar/gui/event-editor.c:603
-msgid "on the"
-msgstr "dans le"
-
-#: calendar/gui/event-editor.c:610
-msgid "th"
-msgstr "i�me"
-
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
-msgstr "occurences"
-
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ce rendez-vons contient des r�currences qu'Evolution ne peut �diter."
-
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
-msgstr " %d jours"
-
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
-msgstr " 1 jour"
-
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
-msgstr " %d semaines"
-
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
-msgstr " 1 semaine"
-
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
-msgstr " %d heures"
-
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
-msgstr " 1 heure"
-
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutes"
-
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
-msgstr " 1 minute"
-
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d seconds"
-msgstr " %d secondes"
-
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
-msgstr " 1 seconde"
-
-#: calendar/gui/event-editor.c:1603
-#, fuzzy
-msgid " before start of appointment"
-msgstr "Cr�e un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:1605
-#, fuzzy
-msgid " after start of appointment"
-msgstr "Cr�e un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:1613
-#, fuzzy
-msgid " before end of appointment"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/event-editor.c:1615
-#, fuzzy
-msgid " after end of appointment"
-msgstr "Cr�e un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conduite � Calendrier � d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-"Utilitaire de configuration pour la conduite � Calendrier � d'Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans � %s �"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "La m�thode requise pour charger � %s � n'est pas support�e"
@@ -2987,236 +3690,256 @@ msgid "Go To Date"
 msgstr "Aller � la date"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Aller � aujourd'hui"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Janvier"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Juillet"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Juin"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Octobre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Aller � aujourd'hui"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4�me"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9�me"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10�me"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11�me"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12�me"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13�me"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14�me"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15�me"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16�me"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17�me"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18�me"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19�me"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20�me"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21�me"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22�me"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23�me"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24�me"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25�me"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26�me"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27�me"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28�me"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29�me"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30�me"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31�me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "T�ches"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour en cours (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semaine en cours (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mois en cours (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ann�e en cours (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Aper�u Avant Impression"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprime cet �l�ment"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Configuration de l'impression"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI que le calendrier affichera"
@@ -3253,94 +3976,113 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr ""
 "Ne peut enregistrer le dossier � %s � :\n"
 "%s"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "�criture du message %d du %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "_Message �lectronique (FIXME)"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Ne peut obtenir le message : %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "Compl�t�"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "�criture du message %d du %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "�criture du message %d du %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
@@ -3376,14 +4118,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne peut cr�er le tube : %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne peut obtenir le r�pertoire : %s : %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Ne peut cloner : %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3400,113 +4161,108 @@ msgstr "Impossible d'obtenir le verrou avec fcntl(2) : %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Impossible d'obtenir le verrou avec flock(2) : %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, 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:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, 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:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Ne peut tester le fichier de verrouillage pour %s : %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erreur de lecture du fichier de courrier : %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erreur d'�criture du fichier temporaire de courrier : %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ne peut cr�er le tube : %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ne peut cloner : %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "�chec du programme movemail : %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erreur de lecture du fichier de courrier : %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur d'�criture du fichier temporaire de courrier : %s"
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Veuillez saisir votre %s phrase de passe pour %s"
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Veuillez saisir votre %s phrase de passe"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Aucun mot de passe fournit."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Ne peut cr�er de fichier temporaire : %s"
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Aucun destinataires sp�cifi�s"
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3525,37 +4281,37 @@ msgstr "Ne peut charger %s : %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne peut charger %s : Aucun code d'initialisation dans le module."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveur %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Connexion annul�e"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter � %s (port %d) : %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(h�te inconnu)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Op�ration annul�e"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "Serveur d�connect�."
@@ -3672,72 +4428,81 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Mauvaise r�ponse d'identification du serveur."
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "Identification"
+
+#: camel/camel-search-private.c:111
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Echec d'�criture dans la boite � lettres temporaire : %s : %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL � %s � a besoin du composant � nom d'utilisateur �"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL � %s � a besoin du composant � h�te �"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL � %s � a besoin du composant � chemin �"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Test de \"%s\""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Founisseur de dossier de courrier virtuel"
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture de courrier comme requ�te a un autre ensemble de dossiers"
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole � %s �"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3746,12 +4511,73 @@ msgstr ""
 "Ne peut cr�er le r�pertoire %s :\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Veuillez saisir votre %s phrase de passe pour %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Ce fichier n'existe pas."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Ce fichier n'existe pas."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "�chec d'envoi du nom d'utilisateur au serveur"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "T�che"
+msgid "Failed to decode message."
+msgstr "_Message �lectronique (FIXME)"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Cacher le sujet \"%s\""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
@@ -3760,68 +4586,95 @@ msgstr ""
 "Impossible d'ouvrir le fichier � %s � :\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Aucun message correspondant"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"Vous ne pouvez �diter des messages que\n"
+"lorsqu'ils sont dans le dossier Brouillons."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "R�ponse innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "�chec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "La r�ponse du serveur s'est termin�e trop tot."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La r�ponse du serveur IMAP ne contient pas l'information %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�ponse OK innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, 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:211
 #, 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:351
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Scrutation des dossiers dans � %s �"
+msgid "Scanning for changed messages"
+msgstr "Enregistrement des changements dans le message..."
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Enregistre les messages"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 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-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Ne peut cr�er le r�pertoire %s : %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Cr�e une nouveau contact"
@@ -3831,7 +4684,7 @@ msgstr "Cr�e une nouveau contact"
 msgid "Check for new messages in all folders"
 msgstr "Marquage des messages du dossier \"%s\""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -3867,30 +4720,30 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le m�canisme d'identification demand�."
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucune identification requise"
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3901,104 +4754,116 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Voir le s�lecteur de dossier"
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Ne peut cr�er le r�pertoire %s : %s"
+msgid "No such folder %s"
+msgstr "Aucun dossier � %s �."
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "R�pertoires de courrier au format UNIX MH (version CamelLocal)"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 "Pour stocker le courrier local dans des r�pertoires de courrier au format MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Pour stocker le courrier local au format standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 #, fuzzy
 msgid "Qmail maildir-format mail files"
 msgstr "Fichiers de courrier au format UNIX qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 "Pour stocker le courrier local dans des r�pertoires de courrier au format "
 "qmail"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+"Pour stocker le courrier local dans des r�pertoires de courrier au format "
+"qmail"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, 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:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La racine de stockage %s n'est pas un r�pertoire normal"
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 #, fuzzy
 msgid "Local stores do not have an inbox"
 msgstr "Le stockage local n'a pas de r�pertoire racine"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, 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:283
+#: camel/providers/local/camel-local-store.c:279
 #, 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:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier � %s � : %s"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossible de concat�ner le message au dossier maildir : %s : %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4007,18 +4872,19 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contenu de message invalide"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4028,14 +4894,14 @@ msgstr ""
 "Ne peut ouvrir le dossier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Le dossier � %s � n'existe pas."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4045,28 +4911,43 @@ msgstr ""
 "Ne peut cr�er le dossier � %s � :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, 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:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossible de supprimer le dossier � %s � : %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "n'est pas un r�pertoire maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Ne peut cr�er le dossier � %s � :\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Ne peut ouvrir la bo�te � lettres : %s : %s\n"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne peut ouvrir la bo�te � lettres : %s : %s\n"
@@ -4076,9 +4957,12 @@ msgstr "Ne peut ouvrir la bo�te � lettres : %s : %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Impossible de concat�ner le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4087,11 +4971,13 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irr�m�diablement corrompu"
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4136,86 +5022,103 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Impossible d'ouvrir le dossier : %s : r�sume depuis la position %ld : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne peut r�sumer le dossier : %s :%s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Ne peut ouvrir le dossier � r�sumer : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, 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:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Le r�sum� et le dossier ne correspondent pas, meme apr�s une synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, 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:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Echec d'�criture dans la boite � lettres temporaire : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, 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:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossible de concat�ner le message au dossier mh : %s : %s"
@@ -4225,39 +5128,100 @@ msgstr "Impossible de concat�ner le message au dossier mh : %s : %s"
 msgid "`%s' is not a directory."
 msgstr "� %s � n'est pas un r�pertoire."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Ne peut ouvrir la bo�te � lettres : %s : %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Impossible de concat�ner le message au fichier mbox : %s : %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "� %s � n'est pas un fichier normal."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Le dossier � %s � n'existe pas."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Le stockage local n'a pas de r�pertoire racine"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Fichier de courrier local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Les dossiers locaux ne peuvent �tre encapsul�s."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Les dossiers locaux ne peuvent �tre encapsul�s."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Ne peut ouvrir le fichier de courrier temporaire %s : %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Impossible de fermer le dossier source %s : %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Veuillez entrer le mot de passe NNTP pour %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Le serveur a rejet� le nom d'utilisateur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "�chec d'envoi du nom d'utilisateur au serveur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Le serveur a rejet� le nom d'utilisateur / mot de passe"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Message %s non trouv�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 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:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Inpossible de charger la liste des groupes du serveur pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4273,17 +5237,17 @@ msgstr ""
 "C'est un fournisseur pour la lecture et la publication dans les groupes de "
 "nouvelles USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4291,8 +5255,8 @@ 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:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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"
@@ -4302,22 +5266,32 @@ msgstr "Incapable d'ouvrir ou de cr�er un fichier .newsrc pour %s : %s"
 msgid "Retrieving POP summary"
 msgstr "R�cup�ration des messages"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "Ne peut se connecter au serveur POP sur %s."
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 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:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "R�cup�ration du message %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "Impossible d'envoyer le message : %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, 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"
@@ -4337,7 +5311,7 @@ msgstr "Ne pas effacer les messages du serveur"
 msgid "Delete after %s day(s)"
 msgstr "Supprime la t�che"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4375,22 +5349,27 @@ msgstr ""
 "Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
 "identifier."
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, 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:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "Ne peut se connecter au serveur POP sur %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, 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:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4399,12 +5378,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:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4412,7 +5391,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:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4421,13 +5400,13 @@ 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:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier � %s �."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4482,7 +5461,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4493,130 +5472,130 @@ msgstr ""
 "Pour livrer le courrier en vous connectant � un distributeur distant "
 "utilisant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Commande non impl�ment�e"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Service pret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "�chec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fournit."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le m�canisme d'identification demand�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erreur du message de bienvenur : %s : s�rement pas grave"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le m�canisme d'identification demand�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4627,232 +5606,238 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas d�fini"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Envoie du message"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 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:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Identification"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Ne peut ex�cuter %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Ne peut ex�cuter %s : courrier non envoy�."
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise r�ponse d'identification du serveur."
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Ne peut cr�er de tube vers sendmail : %s : courrier non envoy�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ne peut ex�cuter %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Ne peut ex�cuter %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "sendmail s'est termin� avec le signal %s : courrier non envoy�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fko"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fMo"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "pi�ce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Joindre un fichier"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Supprimer les �l�ments s�lectionn�s de la liste des pi�ces-jointes"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Ajouter une pi�ce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr "Pi�ce-jointe"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propri�t�s de la pi�ce-jointe"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nom du fichier : "
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "pi�ce-jointe incorpor�e"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Type MIME :"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Envoyer comme :"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "R�pondre-� :"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "� :"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entrez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4860,41 +5845,102 @@ msgstr ""
 "Entrez les adresses qui recevront une copie carbone du message sans "
 "apparaitre dans la liste des destinataires du messages."
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Joindre un fichier"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Ne peut ouvrir le fichier %s :\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Ne peut ouvrir le fichier de signature %s :\n"
+"Erreur durant le pr�paration vers %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Avertissement"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erreur d'enregistrement du fichier : %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Ne pas r�cup�rer le message du serveur POP %s : %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Ne peut cr�er le fichier de sortie : %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Ne peut cr�er le fichier de sortie : %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erreur lors de l'enregistrement des messages vers : %s :\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4904,53 +5950,35 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr "Ce fichier n'existe pas."
-
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
-msgstr "Ce n'est pas un fichier normal."
-
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr "Ce fichier existe mais n'est pas lisible."
-
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ce fichier apparait accessible mais l'ouverture 'open(2)' a �chou�."
-
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Ce fichier est tr�s gros (plus de 100 ko).\n"
-"�tes-vous s�r de vouloir l'ins�rer ?"
-
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
-msgstr "Une erreur est survenue durant la lecture du fichier."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Ens�rer un fichier texte..."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Ne peut cr�er la fen�tre de composition."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
@@ -4970,305 +5998,126 @@ msgid "calendar information"
 msgstr "Information utilisateur"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, 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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "R�cup�ration du courrier depuis %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Fermer %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "D�placer vers le dossier"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Va � la date actuelle"
-
-#: executive-summary/component/e-summary-url.c:79
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Va � la date actuelle"
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configuration du dossier..."
-
-#: executive-summary/component/e-summary.c:924
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le fichier %s :\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erreur de lecture du fichier de courrier : %s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "R�sum�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Marque la t�che comme compl�t�e"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Ajouter un service"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Erreur"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-#, fuzzy
-msgid "Update now"
-msgstr "Mettre � jour le calendrier"
-
-#: executive-summary/test-service/rdf-summary.c:788
-#, fuzzy
-msgid "Update every "
-msgstr "_Mettre � jour Libre/Occup�"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutes"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "an"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "ann�es"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mois"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mois"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semaine"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semaines"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "jours"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "heure"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "heures"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minute"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "seconde"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "secondes"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oups. Vous avez oubli� de choisir une date."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oups. Vous avez choisi une date invalide."
 
-#: filter/filter-datespec.c:275
+#: 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"
@@ -5277,7 +6126,7 @@ msgstr ""
 "La date du message sera compar� � la date d'execution\n"
 "du filtre ou lorsque le dossier virtuel est ouvert."
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5285,7 +6134,7 @@ msgstr ""
 "La date du message sera compar� � la date\n"
 "que vous sp�cifiez ici."
 
-#: filter/filter-datespec.c:338
+#: 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"
@@ -5296,28 +6145,37 @@ msgstr ""
 "� il y a une semaine �, par exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "la date actuelle"
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "une date que vous sp�cifiez"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "une date relative � la date en cours"
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparer avec"
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "maintenant"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "pass�"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "pass�"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour s�lectionner une date>"
 
@@ -5326,11 +6184,11 @@ msgid "Filter Rules"
 msgstr "R�gles de Filtrage"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Alors"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Ajouter l'action"
 
@@ -5340,20 +6198,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "S�lectionnez un Dossier"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Entrez l'URI du dossier"
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour s�lectionner un dossier>"
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5362,7 +6220,7 @@ msgstr ""
 "Erreur durant le pr�paration vers %s :\n"
 "%s"
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
@@ -5374,26 +6232,45 @@ msgstr "Nom de la r�gle : "
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Ex�cuter les actions"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "si tous les crit�res sont remplis"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "si un des crit�res est rempli"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Ajouter un crit�re"
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr "entrant"
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr "sortant"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Ajouter"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "�diter"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "�diter les Filtres"
@@ -5436,380 +6313,521 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Enregistre le dossier local"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
 msgstr "Assigner une couleur"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigner un score"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Attachments"
 msgstr "Pi�ce-jointe"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date de r�ception"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Supprim�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "ne fini pas avec"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "ne ressemble pas"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "ne commence pas par"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "n'existe pas"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "Date"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "fini avec"
+
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Exist"
 msgstr "Quitter"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Fait suivre � l'adresse"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "n'est pas"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "est"
 
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "Is"
-msgstr "Si"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "est plus que"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "est moins que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "n'est pas"
+
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "liste de diffusion %s"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "En-t�te du message"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Le message a �t� re�u"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Le message a �t� envoy�"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "D�placer vers le dossier"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "sur ou apr�s"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "sur ou avant"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Lu"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "R�pondu �"
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Exp�diteur"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "D�finir l'�tat"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Taille"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "ressemble �"
+
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "Compte"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "En-t�te sp�cifique"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "D�bute avec"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Arr�te le traitement"
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Sujet"
 
-#: filter/libfilter-i18n.h:38
-msgid "contains"
-msgstr "contient"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "�tait apr�s"
 
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
-msgstr "ne contient pas"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "�tait avant"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
-msgstr "ne fini pas avec"
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "mar"
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
-msgstr "n'existe pas"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Ajouter une r�gle"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
-msgstr "ne ressemble pas"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "�diter les Filtres"
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
-msgstr "ne commence pas par"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "�diter la r�gle de score"
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
-msgstr "fini avec"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
-msgstr "existe"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importer"
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
-msgstr "est plus que"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "Courrier"
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
-msgstr "est moins que"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "n'est pas"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Adresse �lec."
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "est"
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Ajouter un carnet d'adresses"
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
-msgstr "sur ou apr�s"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
-msgstr "sur ou avant"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_R�glages"
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
-msgstr "ressemble �"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
-msgstr "D�bute avec"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
-msgstr "�tait apr�s"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "E-mail principal"
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
-msgstr "�tait avant"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
 
-#: filter/score-editor.c:130
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Score Rules"
-msgstr "�diter la r�gle de score"
+msgid "Evolution mail composer."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Conduit Calendrier"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Conduit Calendrier"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configuration de la messagerie"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propri�t�s..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Propri�t�s de la Liste '� Faire'"
 
-#: mail/component-factory.c:329
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propri�t�s"
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "Propri�t�s"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "S�lectionnez un Dossier"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Dossier virtuel sur l'exp�diteur"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "Dossier virtuel sur l'e_xp�diteur"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Dossier virtuel sur les destinataires"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:1247
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on Mailing _List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtre sur l'exp�diteur"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "seconde"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Enregistrer sous..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "Enregistrer _sous..."
+
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "_Imprimer"
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "R�pondre � l'exp�diteur"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
-msgstr "R�pondre � tous"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "R�pondre � _tous"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
-msgstr "Faire suivre"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "R�pondre � _tous"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
-msgstr "Faire suire incorpor�"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Mar_k as Read"
 msgstr "Marquer comme lu"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#, fuzzy
+msgid "Mark as U_nread"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "D�placer vers le dossier..."
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Important"
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Copier vers le dossier..."
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
-msgstr "R�cup�rer"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "_D�placer vers le dossier..."
+
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copier vers le dossier..."
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "_R�cup�rer"
+
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Ajouter un carnet d'adresses"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Factory to import mbox into Evolution"
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Conduit Calendrier"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Conduit Calendrier"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
@@ -5845,44 +6863,75 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: 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 ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Conduit '� faire' d'Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Conduit '� faire' d'Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Signature :"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Ce message n'a pas �t� envoy�.\n"
+"\n"
+"Voulez-vous enregistrer vos changements ?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (d�faut)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 #, fuzzy
 msgid "Disable"
 msgstr "D�sactiver."
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "�tes-vous s�r de vouloir supprimer cette t�che sans titre %s ?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "R�cup�rer"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "�tes-vous s�r de vouloir supprimer ce rendez-vous sans titre ?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Gestionnaire de comptes Evolution"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Conduit '� faire' d'Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5903,11 +6952,11 @@ msgstr "Courrier de %s"
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Ajouter une R�gle de Filtre"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5919,7 +6968,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5927,7 +6976,7 @@ msgstr ""
 "Vous devez configurer une identit�\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5935,11 +6984,11 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas d�fini de m�thode de transport de courrier"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5947,33 +6996,46 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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:351
+#: mail/mail-callbacks.c:410
 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:591
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
 msgstr "Le %s, %s a �crit :\n"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Message suivi :\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "�tes-vous s�r de vouloir supprimer la t�che � %s � ?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5981,7 +7043,7 @@ msgstr ""
 "Vous ne pouvez �diter des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -5990,27 +7052,25 @@ msgstr ""
 "Vous ne pouvez �diter des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "�craser le fichier ?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "�tes-vous s�r de vouloir supprimer la t�che � %s � ?"
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Un fichier avec le m�me nom existe.\n"
-"L'�craser ?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Le message a �t� re�u"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6019,15 +7079,60 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtres de message..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "�chec de l'impression du message"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "�tes-vous s�r de vouloir supprimer ce rendez-vous sans titre ?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
@@ -6043,36 +7148,66 @@ msgid " color"
 msgstr "Couleurs"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Pi�ce-jointe"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Type d'identification :"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Composer"
+
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -6085,184 +7220,300 @@ msgstr ""
 "Votre configuration de la messagerie est maintenant compl�t�e.\n"
 "Cliquez sur \"Terminer\" pour enregistrer vos nouveaux param�tres."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "D�faut"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Date"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Cr�ation d'un nouveau dossier"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "�diter"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Adresse �lectronique :"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "D�sactiv�"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
 #, fuzzy
-msgid "Highlight citations with "
+msgid "HTML Signature:"
+msgstr "Signature :"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Mettre en �vidence les �l�ments s'achevant aujourd'hui"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Voir en ligne"
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Configuration de la messagerie"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "Marque les messages comme vus [ms] : "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Serveur :"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nouvelles"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Pas d'information"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "Encrypter avec PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Choisissez une couleur"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Adjoint un message sans sujet"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Note"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Information utilisateur"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Secure MIME"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_S�curit�"
+
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Select PGP binary"
 msgstr "S�lectionner un fichier"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Envoie le message au format HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Vu"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Calendrier"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Type de serveur : "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Le serveur n�cessite une identification"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Fichier de signature :"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Source"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Pas d'information"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Sources"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Dossiers Virtuels"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Use secure connection (SSL)"
 msgstr "Ce serveur n�cessite une connexion s�curis� (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
@@ -6270,201 +7521,248 @@ msgid ""
 "Click \"Next\" to begin. "
 msgstr "Configuration de la messagerie Evolution"
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "_�dition"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "newswindow1"
+msgstr "fen�tre2"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "secondes."
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Ne peut cr�er la bo�te de dialogue"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Enregistrer la pi�ce-jointe"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Enregistrer sur le disque..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Ouvrir dans %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualiseur externe"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualiseur externe"
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Open link in browser"
+msgid "Loading message content"
+msgstr "Contenu de message invalide"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Ouvrir dans une nouvelle fen�tre"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Copy Link Location"
+msgstr "_Contact (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "_T�che (FIXME)"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Save Image as..."
+msgstr "Enregistrer sous..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d secondes"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "pi�ce-jointe %s"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossible d'ouvrir le dossier : la liste des messages �tait incomplete."
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Date"
+
+#: mail/mail-format.c:842
 #, fuzzy
-msgid "Loading message content"
-msgstr "Contenu de message invalide"
+msgid "Bad Address"
+msgstr "Adresse �lectronique :"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "R�pondre-� :"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "�"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc :"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "Aucun programme GPG/PGP disponible."
+
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "�diter le message"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Filtre sur la liste de diffusion (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "Aucun dossier � %s �."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier � %s � vers le format � %s �"
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Change de dossier � %s � vers le format � %s �"
-
-#: mail/mail-local.c:815
-msgid "Reconfiguring folder"
-msgstr "Reconfiguration du dossier"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr "Fermeture du dossier en cours"
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr "Renommage du vieus dossier et ouverture"
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr "Cr�ation d'un nouveau dossier"
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr "Copie du message"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6473,7 +7771,7 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6481,7 +7779,16 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette bo�te aux lettres, alors\n"
 "vous aurez besoin de la r�parer manuellement."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_Configuration du dossier..."
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6490,7 +7797,7 @@ msgstr ""
 "Erreur durant � %s � :\n"
 "%s"
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6499,43 +7806,30 @@ msgstr ""
 "Erreur durant l'ex�cution de l'op�ration :\n"
 "%s"
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr "Envoie du message"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "�criture du message %d du %d"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Marque le message %d du %d"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Compl�t�."
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Joints les messages du dossier \"%s\""
@@ -6550,56 +7844,69 @@ msgstr "D�placez le(s) message(s) vers"
 msgid "Copying messages to %s"
 msgstr "Copie du message"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "D�placement"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans � %s �"
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "T�che"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Ouverture du dossier %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfiguration du dossier"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "R�cup�ration du message %s"
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "R�cup�ration des messages"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "R�cup�ration du message num�ro %d de %d (uid � %s �)"
-
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Enregistre les messages"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6608,12 +7915,7 @@ msgstr ""
 "Ne peut cr�er le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Enregistrement du message %d sur %d (uid � %s �)"
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6622,12 +7924,12 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Enregistrer la pi�ce-jointe"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6636,204 +7938,204 @@ msgstr ""
 "Ne peut cr�er le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut �crire les donn�es : %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "R�cup�ration du courrier depuis %s"
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
-msgstr "Rechercher"
+msgid "(Untitled Message)"
+msgstr "(Sans titre)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Messages multiple"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_�diter le message"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "_�diter le message"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Faire suivre"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Rechercher"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Chemin :"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
+msgstr "Annul�."
+
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "R�ception des messages"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 #, fuzzy
 msgid "Receiving"
 msgstr "R�ception des messages"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr ""
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
+msgstr "R�glages..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr ""
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
+msgstr "R�glages..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "Exp�dition de � %s �"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Annul�."
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Message incompl� �crit dans le conduit !"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "L'utilisateur a annul� la requ�te"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ne peut cr�er de mbox temporaire � %s � : %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (message suivi)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (pas de sujet)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Message suivi (pas de sujet)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Messages suivis"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Faire suivre le message"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr "R�pondre"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
-msgstr "R�pond � l'exp�diteur du message"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
-msgstr "R�pond � l'exp�diteur et � tous les destinataires du message"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
-msgstr "Fait suivre le message"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
-msgstr "Imprime le message s�lectionn�"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Supprime le message"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "R�pondu"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Messages multiple"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "Basse"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "Basse"
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Haute"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Haute"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %l:%M %p"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1052
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Enregistre les messages"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1053
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1053
-msgid "Date"
-msgstr "Date"
-
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "R��u"
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr "�"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Taille"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dossier"
 
@@ -6862,132 +8164,1455 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "D�sabonnement au dossier � %s �"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "G�rer les abonnements..."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Folder name:"
-msgstr "Nom du fichier : "
+msgid "Factory for the Evolution executive summary component."
+msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/component-factory.c:140
 #, fuzzy
-msgid "Folder type:"
-msgstr "Type de fichier :"
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "Pas suffisemment d'espace pour cr�er le dossier"
+msgid "Appointments"
+msgstr "Rendez-vous"
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Afficher les rendez-vous"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Aucun r�sum�"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Ajouter un serveur de news"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "Il n'y a pas de nouveaux messages sur %s."
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Installation d'Evolution"
 
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importation"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erreur de chargement du calendrier</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Afficher les t�ches"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "Erreur de chargement %s"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Erreur de chargement %s"
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sections :"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "�chec de l'impression du message"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Ne peut initialiser Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Vider"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatique"
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nom du fichier :"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "S�lectionner un fichier"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Type de fichier :"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importer"
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "D�sactiver."
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "quatri�me"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
+#: my-evolution/metar.c:64
 #, fuzzy
-msgid "Evolution Import Utility"
-msgstr "Conduit '� faire' d'Evolution"
+msgid "Northeast"
+msgstr "No_tes :"
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "dernier"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Sources"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "quatri�me"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Basse"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Basse"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Afficher"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Heavy rain"
+msgstr "Horaires de travail"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "maintenant"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Mettre � jour le calendrier"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Courrier"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#, fuzzy
+msgid "Light hail"
+msgstr "huiti�me"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Afficher un dialogue"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "E-mail principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "R�ception des messages"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Afficher tous les cach�s"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Afficher tous les cach�s"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erreur inconnue"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Heure de _d�but de la r�union :"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "est"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portrait"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "liste de diffusion %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Ferme cette fenetre"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Score"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Afficher les t�ches"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Ferme cette fenetre"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Envoyer"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "En-t�te"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Light haze"
+msgstr "huiti�me"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "jours"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Aout"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Ajouter un serveur de news"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Dossiers"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Tout les invit�s"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Afficher les dossiers commen�ant avec :"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Options d'affichage"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Affichage"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Vendredi"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Serveur de forums"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Mercredi"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mois"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 semaine"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "S�lectionnez un Dossier"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Afficher les t�ches"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Afficher les t�ches"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "T�ches"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unit� :  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Autre"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "V�rifier les r�glages"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Avril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Ne peut initialiser le shell Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "D�tails"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Annuler la r�union"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Dossiers Virtuels"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6995,32 +9620,28 @@ 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:123
+#: shell/e-setup.c:130
 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:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Ne peut mettre � jour les fichiers correctement"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Les fichiers d'Evolution sont correctement install�s."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Il semble que c'est la premi�re fois que vous utilisez Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Cliquez sur � Valider � pour installer les fichiers utilisateur d'Evolution "
 "sous"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7031,16 +9652,14 @@ msgstr ""
 "%s\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Ne peut copier les fichiers dans\n"
-"� %s �."
+msgstr "Une erreur est survenue durant la lecture du fichier."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7051,7 +9670,16 @@ msgstr ""
 "D�placez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7062,7 +9690,58 @@ msgstr ""
 "d'Evolution. D�placez le afin de permettre\n"
 "l'installation des fichiers utilisateur d'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Ne peut obtenir le r�pertoire : %s : %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Ne peut copier les fichiers dans\n"
+"� %s �."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copier vers le dossier"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "D�placer vers le dossier"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Supprime la t�che"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "�tes-vous s�r de vouloir supprimer la t�che � %s � ?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Ouverture du dossier %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7071,15 +9750,15 @@ msgstr ""
 "Ne peut cr�er le dossier sp�cifi� :\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Le nom de dossier sp�cifi� n'est pas valide."
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cr�ez un nouveau dossier"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7087,27 +9766,117 @@ 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:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Il n'y a pas de nouveaux messages sur %s."
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importation"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erreur de chargement %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Erreur de chargement %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automatique"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nom du fichier :"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "S�lectionner un fichier"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Type de fichier :"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "S�lectionnez un Dossier"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 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:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut �tre ex�cut�."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7117,30 +9886,72 @@ msgstr ""
 "pour la messagerie, l'agenda, et la gestion de contacts\n"
 "� l'int�rieur de l'environnement de bureau Gnome."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Cr�er un nouveau groupe de raccourcis"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Travail en cours"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Travail en cours"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affich�)"
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut activer l'entrep�t local -- %s"
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7149,15 +9960,15 @@ msgstr ""
 "Ouups !  La vue pour � %s � est morte de mani�re inattendue.  :-(\n"
 "Cela signifie probablement que le composant %s a plant�."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Cr�er un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7166,147 +9977,271 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "� %s � de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Petites icones"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Affiche les raccourcis sous forme de petites icones"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Grandes icones"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Affiche les raccourcis sous forme de grandes icones"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Cr�er un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Supprimer ce groupe..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activer"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ouvrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Ouvrir dans une nouvelle fen�tre"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Envoie le message maintenant"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Active ce raccourci"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la r�gle : "
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprime ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "_Vue"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Voir le s�lecteur de dossier"
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacts"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erreur g�n�rique"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le m�me nom existe"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier sp�cifi� n'est pas valide"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisemment d'espace pour cr�er le dossier"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Le dossier sp�cifi� n'a pas �t� trouv�"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas impl�ment� dans cet entrepot"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permission refus�e"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Op�ration non support�e"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Le type sp�cifi� n'est pas support� dans cet entrepot"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "Ne peut initialiser le shell Evolution."
+msgid "%s (%d%% complete)"
+msgstr "% Comp_l�t� :"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "N'importe quel champ contient"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "H�te :"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom du fichier : "
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Type de fichier :"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Pas suffisemment d'espace pour cr�er le dossier"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Conduit '� faire' d'Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importer"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Ne pas enlever"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Ne plus afficher ce message."
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7333,7 +10268,7 @@ msgstr ""
 "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:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7341,260 +10276,336 @@ msgstr ""
 "Merci\n"
 "L'�quipe d'Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copier"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copie la s�lection"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Cr�er un nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Supprimer le contact"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Cr�er un nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Rechercher"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Couper"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Rechercher un contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Coupe la s�lection"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Supprimer le contact"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nouvelles"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Coller"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Colle le contenu du presse-papiers"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimer les contacts"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "S�lectionner tout"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Supprimer le contact"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Arr�ter"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Arr�te le chargement"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Tout voir"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Voir tous les contacts"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Sources du carnet d'adresses"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contacts"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_S�lectionner tout"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Outils"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 jours"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Modifier les pr�f�rences"
+#: ui/evolution-calendar.xml.h:2
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Configuration du conduit Adresses"
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Cr�e un nouveau calendrier"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Cr�e un nouveau calendrier"
+msgid "Create a new appointment"
+msgstr "Cr�e un nouveau rendez-vous"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Jour"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Aller �"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Recule dans le temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Avance dans le temps"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Aller � la date"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "Aller � aujourd'hui"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Va � une date pr�cise"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Va � la date actuelle"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mois"
-
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New _Event"
-msgstr "Nouveau Ca_lendrier"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Suivant"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Ouvrir un calendrier"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Pr�c"
+msgid "New Appointment"
+msgstr "Nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimer le Calendrier"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimer ce calendrier"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Enregistrer sous"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Information utilisateur"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Enregistrer le calendrier comme quelquechose d'autre"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Affiche une journ�e"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Affiche un mois"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Affiche une semaine"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Affiche une semaine de travail"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "Semaine de travail"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Semaine"
-
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Rendez-vous"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "R�glages..."
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nouveau"
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
+msgstr "Semaine"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Ouvrir un calendrier"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Fermer"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Enregistrer _sous..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Ferme ce rendez-vous"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Supprimer ce rendez-vous"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barre d'outils principale"
+
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "_Week"
-msgstr "Semaine"
+msgid "Preview the printed item"
+msgstr "Visualise le message a imprimer"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Aper�u Avant Impression"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configuration de l'impression"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprime cet �l�ment"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimer..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Enregistrer et Quitter"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Actions"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fichier"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Supprimer cet �l�ment"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Supprimer..."
 
@@ -7606,27 +10617,12 @@ msgstr "Aide"
 msgid "Print En_velope..."
 msgstr "Imprimer une en_veloppe..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprime cet �l�ment"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimer..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Enregistrer et Quitter"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
@@ -7644,989 +10640,1031 @@ msgstr "Voir l'aide en ligne"
 msgid "Send _message to contact..."
 msgstr "Envoie un _message au contact..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "_Fichier"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "� propos de cette application"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Supprimer cet �l�ment"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "� propos..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Actio_ns"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "_Inviter d'autres personnes..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Envoie un _message au contact..."
+
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Annuler la r�union"
+
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Vider"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Faire suivre"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Co_uper"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Fait suivre le message"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_T�che (FIXME)"
+msgid "Re_fresh Meeting"
+msgstr "S�lectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Vider"
+#: ui/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "S�lectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Vide la s�lection"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "S�lectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Ferme ce rendez-vous"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Actions"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_ier vers le dossier... (FIXME)"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copier"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Annul�"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copie la s�lection"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "la date actuelle"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Couper"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Composer"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Coupe la s�lection"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Compose un nouveau message"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Supprimer ce rendez-vous"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+msgid "Empty _Trash"
+msgstr "Jours vides :"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-#, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "_T�che (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Oublier les _mots de passe"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Go to the next item"
-msgstr "Va � la date actuelle"
+msgid "Manage _Subscriptions..."
+msgstr "G�rer les abonnements..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-#, fuzzy
-msgid "Go to the previous item"
-msgstr "Va � la date actuelle"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_T�che (FIXME)"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "D�place le message vers un nouveau dossier"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "Propri�t�s de la Liste '� Faire'"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Suivant"
+msgid "Send / Receive"
+msgstr "R�ception des messages"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Coller"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Envoie les messages en attente et r�cup�re les nouveaux messages"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Colle le contenu du presse-papiers"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Pr�c�dent"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Pr�c�dent"
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "�diteur de dossier _virtuel..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Print Pre_view"
-msgstr "Aper�u Avant Impression"
+msgid "_Filters..."
+msgstr "_Filtres de message..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Configuration de l'impr_ession..."
+#: ui/evolution-mail-global.xml.h:20
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Message �lectronique (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Configuration de l'impression"
+#: ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "R�glages..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Enregistrer"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Aper�u"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
+msgid "_Send / Receive"
+msgstr "R�ception des messages"
+
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "Save the current file"
-msgstr "la date actuelle"
+msgid "Copy selected messages"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:46
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "S�lectionnez un Dossier"
+msgid "Cut selected messages"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "S�lectionner tout"
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Supprimer le message"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "S�lectionnez un Dossier"
+msgid "Hide _Read Messages"
+msgstr "Message suivi - %s"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "_T�che (FIXME)"
+msgid "Mark All as R_ead"
+msgstr "Marquer comme lu"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "� _propos..."
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
-msgstr "_Fermer"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Colle le contenu du presse-papiers"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "D�place le message vers un nouveau dossier"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copier"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "S�lectionnez _tout"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_D�bog"
+#: ui/evolution-mail-list.xml.h:16
+#, fuzzy
+msgid "Select _Thread"
+msgstr "S�lectionnez _tout"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Aide"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-#, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_T�che (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Select all visible messages"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+msgid "Show _All"
+msgstr "Afficher tout"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-#, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Message �lectronique (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "_D�placer vers le dossier..."
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#: ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Temporarily hide the selected messages"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Coller"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimer"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Nettoyer"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Dossier"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverser la s�lection"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Propri�t�s..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_S�lectionner tout"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
-msgstr "_T�che (FIXME)"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Ajouter un service"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "R�pond � l'exp�diteur et � tous les destinataires du message"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "Cr�e une nouveau contact"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "R�pond � l'exp�diteur du message"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copie le message vers un nouveau dossier"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nouveau courrier"
+#: ui/evolution-mail-message.xml.h:7
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Composer"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Compose un nouveau message"
+#: ui/evolution-mail-message.xml.h:11
+#, fuzzy
+msgid "Create a rule to filter messages with this subject"
+msgstr "Envoie un message sans sujet"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "_Copier vers le dossier..."
+msgid "Create a virtual folder for these recipients"
+msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copie le message vers un nouveau dossier"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "Copie le message vers un nouveau dossier"
+msgid "Create a virtual folder for this sender"
+msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this subject"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "R�pond � l'exp�diteur du message"
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Delete the selected messages"
+msgid "Display the next message"
+msgstr "la date actuelle"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-#, fuzzy
-msgid "Edit Message"
-msgstr "_�diter le message"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Edit the current message"
-msgstr "la date actuelle"
+msgid "Display the previous message"
+msgstr "Supprime le message"
 
-#: ui/evolution-mail.xml.h:17
-#, fuzzy
-msgid "Empty _Trash"
-msgstr "Jours vides :"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Expunge"
-msgstr "_Nettoyer"
+msgid "Filter on Mailing _List..."
+msgstr "Filtre sur la liste de diffusion"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Filtre sur l'exp�diteur"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Filtre sur les destinataires"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Filtre sur le sujet"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
-msgstr "Oublier les _mots de passe"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Forward As"
 msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Faire suivre un message sans sujet"
+msgid "Forward _Inline"
+msgstr "Faire suire incorpor�"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Full _Headers"
-msgstr "Rechercher compl�te"
+msgid "Forward _Quoted"
+msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Supprimer le message"
+msgid "Forward the selected message in the body of a new message"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
-msgid "Hide S_elected Messages"
+msgid "Forward the selected message quoted like a reply"
 msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Supprimer le message"
+msgid "Forward the selected message to someone"
+msgstr "D�place le message vers un nouveau dossier"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Message suivi - %s"
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Invert Selection"
-msgstr "_Inverser la s�lection"
+msgid "Load _Images"
+msgstr "Messages suivis"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "G�rer les abonnements..."
+msgid "Mark as I_mportant"
+msgstr "Important"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mar_k as Read"
-msgstr "Marquer comme lu"
+msgid "Mark as Unimp_ortant"
+msgstr "Marquer comme non lu"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
-msgid "Mark All as R_ead"
-msgstr "Marquer comme lu"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-msgid "Mark As Read"
-msgstr "_Marquer comme lus"
+msgid "Mark the selected messages as important"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
-msgstr "Marquer comme _non lu"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark as U_nread"
-msgstr "Marquer comme non lu"
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected messages for deletion"
 msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark the selected messages as not having been read"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "D�placer"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
-msgstr "D�place le message vers un nouveau dossier"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "D�place le message vers un nouveau dossier"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
-msgstr "Ouvrir dans une nouvelle fen�tre"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Suivant"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "R�pond � l'exp�diteur du message"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Message"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "S�lectionnez _tout"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Unread Message"
+msgstr "Messages multiple"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Envoie le message maintenant"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
-msgstr "Aper�u avant impression du message..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
-msgstr "Imprime le message vers l'imprimante"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
-msgstr "Imprimer le message..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Pr�c�dent"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
-msgstr "R�pondre � _tous"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to all"
-msgstr "R�pondre � tous"
+msgid "Previous Unread Message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Reply to sender"
-msgstr "R�pondre � l'exp�diteur"
+msgid "Print Message..."
+msgstr "Imprimer le message..."
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
-msgstr "S_ource"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Aper�u Avant Impression"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "Enregistrer le message dans un dossier sp�cifi�"
+msgid "Print this message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "S�lectionnez _tout"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "R�pondre"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "R�pondre � tous"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Select _Thread"
-msgstr "S�lectionnez _tout"
+msgid "S_earch Message"
+msgstr "Enregistrer le message sous..."
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
-msgid "Send / Receive"
-msgstr "R�ception des messages"
+msgid "Save the message as a text file"
+msgstr "Enregistrer le message dans un dossier sp�cifi�"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Show Email _Source"
+msgstr "Source de courrier"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Envoie les messages en attente et r�cup�re les nouveaux messages"
+msgid "Show Full _Headers"
+msgstr "Rechercher compl�te"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envoie les messages en attente et r�cup�re les nouveaux messages"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Envoie les messages au format HTML"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Show _All"
-msgstr "Afficher tout"
+msgid "Show message with all email headers"
+msgstr "Marquage des messages du dossier \"%s\""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
-msgstr "Liste des messages par enfilade"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Joindre un fichier au message"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprime le message s�lectionn�"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Filtre sur la liste de diffusion"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "Dossier virtuel sur l'e_xp�diteur"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on _Subject..."
 msgstr "Dossier virtuel sur le sujet"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr "Voir la source brut du message"
-
-#: ui/evolution-mail.xml.h:86
-#, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "�diteur de dossier _virtuel..."
-
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Appliquer les filtres"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "Pi�ce-jointe"
-
-#: ui/evolution-mail.xml.h:89
-msgid "_Copy to Folder..."
-msgstr "_Copier vers le dossier..."
+msgid "_Copy to Folder"
+msgstr "Copier vers le dossier"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr "_Nettoyer"
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_Filtres de message..."
+msgid "_Forward Message"
+msgstr "Faire suivre le message"
 
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Dossier"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
-msgstr "_Faire suivre"
-
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Voir en ligne"
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverser la s�lection"
+msgid "_Message Display"
+msgstr "Nettoyer l'affichage des messages"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Mail Message"
-msgstr "_Message �lectronique (FIXME)"
+msgid "_Move to Folder"
+msgstr "D�placer vers le dossier"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
-msgid "_Mail Settings..."
-msgstr "R�glages..."
+msgid "_Normal Display"
+msgstr "_Affichage"
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Move to Folder..."
-msgstr "_D�placer vers le dossier..."
-
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "Ouvrir la t�che"
+msgid "_Open Message"
+msgstr "_�diter le message"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Quoted"
-msgstr "Note"
+msgid "_Re-send Message"
+msgstr "_�diter le message"
 
-#: ui/evolution-mail.xml.h:104
-#, fuzzy
-msgid "_Reply"
-msgstr "R�pondre"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Ferme cette fenetre"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 #, fuzzy
-msgid "_Resend Messages"
-msgstr "_�diter le message"
+msgid "Customi_ze Toolbars..."
+msgstr "Personnaliser la barre d'outils"
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Save Message As..."
-msgstr "_Enregistrer le message sous..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personnaliser"
 
-#: ui/evolution-mail.xml.h:108
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "R�ception des messages"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personnaliser la barre d'outils"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr "_Enfiler"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Fermer"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
-msgstr "_R�cup�rer"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vue"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Joindre"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Ferme le fichier en cours"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "S�lectionner un fichier de signature"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encrypter le message avec PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Ens�rer un fichier texte..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Ins�re un fichier comme texte dans le message"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Ens�rer un fichier texte..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encrypter avec PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Signer avec PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Enregistrer le _brouillon"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Encrypter avec PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Enregistrer"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Enregistrer sous"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Enregistrer le _brouillon"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Enregistrer dans le dossier..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "Save the current file"
+msgstr "la date actuelle"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Enregistrer le fichier en cours avec un nom diff�rent"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Enregistrer le message dans un dossier sp�cifi�"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Envoyer"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Envoyer plus _tard"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Envoyer plus _tard"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Envoie le message au format HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Envoie le message plus tard"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Envoie le message maintenant"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Envoyer ce message maintenant"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Afficher / Cacher les pi�ces-jointes"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Afficher les _pi�ces-jointes"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Afficher les pi�ces-jointes"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Signer ce message avec votre cl� PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signer ce message avec votre cl� PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Pi�ce-jointe"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_D�bog"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Supprimer"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertion"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Ins�rer un fichier texte... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "R�pondre-� :"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_S�curit�"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Aide"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ajouter le dossier � votre liste de dossier abonn�s"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "D_ossier"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Rafra�chir la liste"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Rafra�chi la liste de dossiers"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Supprimer le dossier de votre liste de dossier abonn�s"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Se d�sabonner"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_T�che (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Refaire"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "Supprimer l'action"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Remplacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Remplace une cha�ne"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-#, fuzzy
-msgid "Reply to A_ll (FIXME)"
-msgstr "R�pondre � tous"
+msgid "Cancel Task"
+msgstr "T�che"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
+msgid "Delegate Task"
+msgstr "Supprime la t�che"
 
-#: ui/evolution-task-editor-dialog.xml.h:54
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
+msgid "Re_fresh Task"
+msgstr "Rafra�chir la liste"
 
-#: ui/evolution-task-editor-dialog.xml.h:55
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-msgid "Search again for the same string"
-msgstr "_Rechercher des contacts"
+msgid "Configure the task view's settings"
+msgstr "Configuration du conduit Adresses"
 
-#: ui/evolution-task-editor-dialog.xml.h:56
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Search for a string"
-msgstr "_Rechercher des contacts"
+msgid "Copy selected task"
+msgstr "Ouvrir la t�che"
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "D�faire"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
+msgstr "Cr�e une nouvelle tache"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-msgid "Undo the last action"
-msgstr "Supprimer l'action"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_Rendez-vous (FIXME)"
+msgid "Cut selected task"
+msgstr "Supprime la t�che"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "Marquer comme termin�e"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_R�pondre (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Cr�e une nouvelle tache"
+msgid "Delete selected tasks"
+msgstr "Supprime la t�che"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "T�che"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Colle le contenu du presse-papiers"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Enregistrer la tache comme quelquechose d'autre"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Pr�f�rences des taches..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "R�glages..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "T�che"
@@ -8635,244 +11673,367 @@ msgstr "T�che"
 msgid "About Evolution..."
 msgstr "� propos d'Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Ferme cette fenetre"
-
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:2
 #, fuzzy
-msgid "Customi_ze Toolbars..."
-msgstr "Personnaliser la barre d'outils"
+msgid "Add to _Shortcut Bar"
+msgstr "Afficher la barre de _raccourcis"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personnaliser"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personnaliser la barre d'outils"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copier vers le dossier"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "_Cr�er un nouveau dossier..."
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Supprime ce raccourci de la barre de raccourcis"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Cr�ation d'un nouveau dossier"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Supprimer cet �l�ment"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Afficher un dossier diff�rent"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barre de _raccourcis d'Evolution"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Pr�t � _d�marrer"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importer un format de fichier externe"
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Barre d'outils principale"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "D�place le message vers un nouveau dossier"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Ouvrir dans une nouvelle fen�tre"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Envoie le message maintenant"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Afficher les informations concernant Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commute l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Commute l'affichage de la barre de dossiers"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Utilisation du gestionnaire de c_ontact"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Utilisation du _calendrier"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Utilisation de la _messagerie"
 
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "Work Offline"
-msgstr "Travail en cours"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Voir le s�lecteur de dossier"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "� _propos d'Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "_Actions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Rendez-vous (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contact (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copier"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Dossier"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importer un fichier..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Message �lectronique (FIXME)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "D�placer"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nouveau"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Remplacer..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Afficher la barre de _raccourcis"
+
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_T�che (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Travail en cours"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "R�glages..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Adresse"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Soci�t�"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Types de t�l�phones"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Exp�diteur"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "�tat"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Sujet"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Message"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Cat�gorie :"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr "Essai"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Occup�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Hors du bureau"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Pas d'information"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Inviter d'autres personnes..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Options"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Afficher _Zomm� arri�re"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Mettre � jour Libre/Occup�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Toute les _personnes et une ressource"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Personnes _n�cessaires"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Personnes n�cessaires et _une ressource"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Heure de _d�but de la r�union :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la r�union :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Tout les invit�s"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "la date actuelle"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8880,23 +12041,109 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+#, fuzzy
+msgid "Chinese"
+msgstr "Changer"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semaine"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "T�che"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Optionnel"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nouveau"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erreur inconnue : %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Autre"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "�diteur de contacts"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Rechercher"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Avanc�e"
 
-#: widgets/misc/e-filter-bar.c:317
-#, fuzzy
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Afficher tout"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "Avanc�e..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8907,6 +12154,10 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erreur"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Question"
@@ -8920,72 +12171,634 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Recher_cher"
 
-#: views/addressbook/galview.xml.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-msgid "Adress Cards"
-msgstr "Adresse"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Ne peut initialiser GNOME"
 
-#: views/addressbook/galview.xml.h:2
+#: wombat/wombat.c:185
 #, fuzzy
-msgid "By Company"
-msgstr "Soci�t�"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Ne peut initialiser GNOME"
 
-#: views/addressbook/galview.xml.h:3
+#: wombat/wombat.c:198
 #, fuzzy
-msgid "Phone List"
-msgstr "Types de t�l�phones"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Ne peut initialiser Bonobo"
 
-#: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "By Sender"
-msgstr "Exp�diteur"
+#~ msgid "Set task view preferences"
+#~ msgstr "Modifier les pr�f�rences"
 
-#: views/mail/galview.xml.h:2
 #, fuzzy
-msgid "By Status"
-msgstr "�tat"
+#~ msgid "TasksPreferences"
+#~ msgstr "Pr�f�rences des taches..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacts..."
+
+#~ msgid "_Company:"
+#~ msgstr "So_ci�t� :"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Comme _minicartes"
+
+#~ msgid "As _Table"
+#~ msgstr "Comme _tableau"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Il nous est impossible d'ouvrir ce carnet d'adresses. Soit\n"
+#~ "parce que vous avez entrez une URI incorrecte, soit\n"
+#~ "parce que vous avez essayer d'acc�der � un serveur LDAP\n"
+#~ "et que le support LDAP n'a pas �t� compil�. Si vous avez\n"
+#~ "entr� une URI, v�rifiez sa validit� et r�entrez la. Sinon\n"
+#~ "vous essayer probablement d'acc�der � un serveur LDAP,\n"
+#~ "vous devriez t�l�charger et installer OpenLDAP, puis\n"
+#~ "recompiler et installer Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Rechercher..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Ouvrir le calendrier"
+
+#~ msgid "Save calendar"
+#~ msgstr "Enregistrer le calendrier"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erreur de chargement du calendrier :<br>M�thode non support�e"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Expiration des alarmes apr�s"
+
+#~ msgid "Colors"
+#~ msgstr "Couleurs"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activer la sonnerie pour"
+
+#~ msgid "Highlight"
+#~ msgstr "Mettre en �vidence"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "�l�ments expirant aujourd'hui : "
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "�l�ments pas encore expir�s"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "�l�ments pas encore expir�s :"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "�l�ments en retard :"
+
+#~ msgid "TaskPad"
+#~ msgstr "T�chePad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Dur�e avant �ch�ance"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuelles"
+
+#~ msgid "Work week"
+#~ msgstr "Semaine de travail"
+
+#~ msgid "Edit Task"
+#~ msgstr "�diter la t�che"
 
-#: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Subject"
-msgstr "Sujet"
+#~ msgid "Percent complete"
+#~ msgstr "Marque la t�che comme compl�t�e"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marque la t�che comme compl�t�e"
+
+#~ msgid "Edit this task..."
+#~ msgstr "�diter cette t�che..."
+
+#~ msgid "Edit the task"
+#~ msgstr "�dite la t�che"
 
-#: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "Messages"
-msgstr "Message"
+#~ msgid "Go to Today"
+#~ msgstr "Aller � aujourd'hui"
 
-#: views/tasks/galview.xml.h:2
 #, fuzzy
-msgid "With Category"
-msgstr "Cat�gorie :"
+#~ msgid "Schedule Meeting"
+#~ msgstr "S�lectionnez un Dossier"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Supprimer toutes les occurences"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
+#, fuzzy
+#~ msgid "Component successfully updated."
+#~ msgstr "Les fichiers d'Evolution sont correctement install�s."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Je ne peut charger votre fichier de calendrier !\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Je ne peut lire votre fichier de calendrier !\n"
 
-#: wombat/wombat.c:173
 #, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "Ne peut initialiser GNOME"
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Ne peut cr�er un calendrier dans `%s'"
 
-#: wombat/wombat.c:185
 #, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
+#~ msgid "Component successfully deleted."
+#~ msgstr "Les fichiers d'Evolution sont correctement install�s."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Ajouter au calendrier"
 
-#: wombat/wombat.c:198
 #, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "Ne peut initialiser Bonobo"
+#~ msgid " Tentative "
+#~ msgstr "Essai"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Mettre � jour le calendrier"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Tout les invit�s"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Tout les invit�s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr "Annuler la r�union"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "Organisation :"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Rendez-vous �l�mentaires"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Date de _d�but :"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Ne peut tester le fichier de verrouillage pour %s : %s"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Scrutation des dossiers dans � %s �"
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Voir le s�lecteur de dossier"
+
+#~ msgid "Inline attachment"
+#~ msgstr "pi�ce-jointe incorpor�e"
+
+#~ msgid "Send as:"
+#~ msgstr "Envoyer comme :"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut ouvrir le fichier de signature %s :\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Ce n'est pas un fichier normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Ce fichier existe mais n'est pas lisible."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Ce fichier apparait accessible mais l'ouverture 'open(2)' a �chou�."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Ce fichier est tr�s gros (plus de 100 ko).\n"
+#~ "�tes-vous s�r de vouloir l'ins�rer ?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "R�cup�ration du courrier depuis %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Fermer %s"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "D�placer vers le dossier"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Va � la date actuelle"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "Va � la date actuelle"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut ouvrir le fichier %s :\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "R�sum�"
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Marque la t�che comme compl�t�e"
+
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Ajouter un service"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Fait suivre � l'adresse"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "n'est pas"
+
+#, fuzzy
+#~ msgid "Is"
+#~ msgstr "Si"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "Dossier virtuel sur le sujet"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Dossier virtuel sur l'exp�diteur"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Dossier virtuel sur les destinataires"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Marquer comme lu"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "D�placer vers le dossier..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copier vers le dossier..."
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Change de dossier � %s � vers le format � %s �"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Fermeture du dossier en cours"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renommage du vieus dossier et ouverture"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copie du message"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "R�cup�ration du message num�ro %d de %d (uid � %s �)"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Enregistrement du message %d sur %d (uid � %s �)"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Message incompl� �crit dans le conduit !"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (message suivi)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (pas de sujet)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Message suivi (pas de sujet)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprime le message s�lectionn�"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Les fichiers d'Evolution sont correctement install�s."
+
+#~ msgid "Activate"
+#~ msgstr "Activer"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Active ce raccourci"
+
+#~ msgid "Find a contact"
+#~ msgstr "Rechercher un contact"
+
+#~ msgid "View All"
+#~ msgstr "Tout voir"
+
+#~ msgid "View all contacts"
+#~ msgstr "Voir tous les contacts"
+
+#~ msgid "5 Days"
+#~ msgstr "5 jours"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Cr�e un nouveau calendrier"
+
+#~ msgid "Day"
+#~ msgstr "Jour"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Nouveau Ca_lendrier"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Ouvrir un calendrier"
+
+#~ msgid "Prev"
+#~ msgstr "Pr�c"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Enregistrer le calendrier comme quelquechose d'autre"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Ouvrir un calendrier"
+
+#~ msgid "About this application"
+#~ msgstr "� propos de cette application"
+
+#~ msgid "About..."
+#~ msgstr "� propos..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Actio_ns"
+
+#~ msgid "C_lear"
+#~ msgstr "_Vider"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_T�che (FIXME)"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Vide la s�lection"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_ier vers le dossier... (FIXME)"
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "_T�che (FIXME)"
+
+#, fuzzy
+#~ msgid "Go to the next item"
+#~ msgstr "Va � la date actuelle"
+
+#, fuzzy
+#~ msgid "Go to the previous item"
+#~ msgstr "Va � la date actuelle"
+
+#, fuzzy
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_T�che (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "_Suivant"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Pr�c�dent"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Configuration de l'impr_ession..."
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "S�lectionnez un Dossier"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_T�che (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "� _propos..."
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_T�che (FIXME)"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Message �lectronique (FIXME)"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_D�placer vers le dossier..."
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Ajouter un service"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "Cr�e une nouveau contact"
+
+#~ msgid "New Mail"
+#~ msgstr "Nouveau courrier"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "_Copier vers le dossier..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copie le message vers un nouveau dossier"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Nettoyer"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Faire suivre un message sans sujet"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Supprimer le message"
+
+#, fuzzy
+#~ msgid "Invert Selection"
+#~ msgstr "_Inverser la s�lection"
+
+#, fuzzy
+#~ msgid "Mark As Read"
+#~ msgstr "_Marquer comme lus"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marquer comme _non lu"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "D�place le message vers un nouveau dossier"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Aper�u avant impression du message..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprime le message vers l'imprimante"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "R�pondre � tous"
+
+#, fuzzy
+#~ msgid "Reply to sender"
+#~ msgstr "R�pondre � l'exp�diteur"
+
+#~ msgid "S_ource"
+#~ msgstr "S_ource"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Envoie les messages en attente et r�cup�re les nouveaux messages"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Voir la source brut du message"
+
+#, fuzzy
+#~ msgid "_Reply"
+#~ msgstr "R�pondre"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Enregistrer le message sous..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Enfiler"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Envoie le message maintenant"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Ins�rer un fichier texte... (FIXME)"
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_T�che (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refaire"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Supprimer l'action"
+
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
+
+#~ msgid "Replace a string"
+#~ msgstr "Remplace une cha�ne"
+
+#, fuzzy
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "R�pondre � tous"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#, fuzzy
+#~ msgid "Search again for the same string"
+#~ msgstr "_Rechercher des contacts"
+
+#, fuzzy
+#~ msgid "Search for a string"
+#~ msgstr "_Rechercher des contacts"
+
+#~ msgid "Undo"
+#~ msgstr "D�faire"
+
+#, fuzzy
+#~ msgid "Undo the last action"
+#~ msgstr "Supprimer l'action"
+
+#, fuzzy
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Marquer comme termin�e"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_R�pondre (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barre de _raccourcis d'Evolution"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "Avanc�e..."
 
 #, fuzzy
 #~ msgid "Click here to add a contact"
@@ -9015,10 +12828,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Le num�ro de port dans l'URL � %s � n'est pas num�rique"
 
 #, fuzzy
-#~ msgid "Secure IMAPv4"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
 
@@ -9050,15 +12859,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Cette option vous connectera au serveur SMTP sans utiliser d'identification. "
 #~ "Cela devrait �tre suffisant pour se connecter � la plupart des serveurs SMTP."
 
-#~ msgid "Remove action"
-#~ msgstr "Supprimer l'action"
-
 #~ msgid "Remove criterion"
 #~ msgstr "Supprimer le crit�re"
 
-#~ msgid "Source"
-#~ msgstr "Source"
-
 #, fuzzy
 #~ msgid "Unspecified"
 #~ msgstr "Ind�fini"
@@ -9066,18 +12869,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Advanced"
 #~ msgstr "Avanc�e"
 
-#~ msgid "Check settings"
-#~ msgstr "V�rifier les r�glages"
-
 #~ msgid "Email address:"
 #~ msgstr "Adresse �lectronique :"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Configuration de la messagerie Evolution"
 
-#~ msgid "Hostname:"
-#~ msgstr "Nom d'h�te :"
-
 #, fuzzy
 #~ msgid "IMAP"
 #~ msgstr "IMAPv4"
@@ -9088,18 +12885,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail"
-#~ msgstr "Courrier"
-
 #~ msgid "Mail Account"
 #~ msgstr "Compte de messagerie"
 
 #~ msgid "Mail Configuration Druid"
 #~ msgstr "Assistant de configuration de messagerie"
 
-#~ msgid "Optional"
-#~ msgstr "Optionnel"
-
 #~ msgid "Password:"
 #~ msgstr "Mot de passe :"
 
@@ -9119,16 +12910,10 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Save password"
 #~ msgstr "Enregistrer le mot de passe"
 
-#~ msgid "Select signature file"
-#~ msgstr "S�lectionner un fichier de signature"
-
 #, fuzzy
 #~ msgid "Server type:"
 #~ msgstr "Type de serveur : "
 
-#~ msgid "Signature:"
-#~ msgstr "Signature :"
-
 #, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Transparent"
@@ -9159,13 +12944,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "<inconnu>"
 
-#~ msgid "No GPG/PGP program available."
-#~ msgstr "Aucun programme GPG/PGP disponible."
-
-#, fuzzy
-#~ msgid "Message _Display"
-#~ msgstr "Nettoyer l'affichage des messages"
-
 #, fuzzy
 #~ msgid "_Compose"
 #~ msgstr "Composer"
@@ -9174,9 +12952,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Message Hiding"
 #~ msgstr "_Message"
 
-#~ msgid "Disabled"
-#~ msgstr "D�sactiv�"
-
 #~ msgid "Synchronize"
 #~ msgstr "Synchroniser"
 
@@ -9195,9 +12970,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Auteur originel : "
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9237,9 +13009,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Une erreur est survenue durant la r�cup�ration de\n"
 #~ "la liste des Pilot depuis le d�mon gnome-pilot"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "Configuration du conduit Adresses"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Conduit Adresses"
 
@@ -9275,10 +13044,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "La priorit� doit �tre comprise entre 1 et 9 inclus"
 
-#, fuzzy
-#~ msgid "Schedule meeting"
-#~ msgstr "S�lectionnez un Dossier"
-
 #~ msgid "Edit this appointment..."
 #~ msgstr "�diter ce rendez-vous..."
 
@@ -9294,9 +13059,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Entrez le sujet du message"
 
-#~ msgid "Saving changes to message..."
-#~ msgstr "Enregistrement des changements dans le message..."
-
 #~ msgid "Save changes to message..."
 #~ msgstr "Enregistrer les changements dans le message..."
 
@@ -9307,15 +13069,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "�diter la R�gle du Filtre"
 
-#~ msgid "incoming"
-#~ msgstr "entrant"
-
-#~ msgid "outgoing"
-#~ msgstr "sortant"
-
-#~ msgid "Add Rule"
-#~ msgstr "Ajouter une r�gle"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Ajouter une r�gle de dossier virtuel"
 
@@ -9347,9 +13100,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Account Properties"
 #~ msgstr "Propri�t�s du compte"
 
-#~ msgid "E-Mail Address:"
-#~ msgstr "Adresse �lectronique :"
-
 #~ msgid "Incoming Mail Server"
 #~ msgstr "Serveur de courrier entrant"
 
@@ -9368,9 +13118,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Adjation de � %s �"
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Adjoint un message sans sujet"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "D�placement des messages de � %s � vers � %s �"
 
@@ -9393,13 +13140,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Charge %s dossier pour %s"
 
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Erreur durant le pr�paration vers %s :\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -9412,12 +13152,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Message corrompu de l'enfilade envoy�e ?"
 
-#~ msgid "Could not create dialog box."
-#~ msgstr "Ne peut cr�er la bo�te de dialogue"
-
-#~ msgid "User cancelled query."
-#~ msgstr "L'utilisateur a annul� la requ�te"
-
 #~ msgid ""
 #~ "Cannot open location `%s':\n"
 #~ "%s"
@@ -9477,9 +13211,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_Dossier Virtuel sur le sujet"
 
-#~ msgid "New"
-#~ msgstr "Nouveau"
-
 #~ msgid "Customi_ze..."
 #~ msgstr "_Personnaliser..."
 
@@ -9489,9 +13220,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Afficher la barre de raccourci_s"
 
-#~ msgid "_Settings"
-#~ msgstr "_R�glages"
-
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -9527,19 +13255,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "La stockage local n'a pas de r�pertoire par d�faut"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Les dossiers locaux ne peuvent �tre encapsul�s."
-
 #~ msgid "Congratulations, your mail configuration is complete.\n"
 #~ msgstr "F�licitations, votre configuration de messagerie est effectu�.\n"
 
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright (C) 2000, Helix Code, Inc."
 
-#, fuzzy
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
@@ -9551,26 +13272,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Ne peut initialiser Bonobo"
-
 #~ msgid "Open..."
 #~ msgstr "Ouvrir..."
 
 #~ msgid "You have no Outbox configured"
 #~ msgstr "Vous n'avez pas de bo�te de sortie configur�"
 
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne peut ouvrir le fichier %s :\n"
-#~ "%s"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "R�cup�ration du courrier depuis %s"
-
 #~ msgid "Fetch email from %s"
 #~ msgstr "R�cup�re le courrier depuis %s"
 
@@ -9683,10 +13390,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "�diter le message"
 
 #, fuzzy
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "Faire suivre"
-
-#, fuzzy
 #~ msgid "FIXME: For_ward"
 #~ msgstr "Faire suivre"
 
@@ -9698,9 +13401,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "FIXME: Next"
 #~ msgstr "_Filtres de message..."
 
-#~ msgid "Group %i"
-#~ msgstr "Groupe %i"
-
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr ""
 #~ "<b>Erreur de chargement du calendrier :<br>Calendrier en cours d'utilisation"
@@ -9727,15 +13427,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Minutes"
 #~ msgstr "Minutes"
 
-#~ msgid "Time"
-#~ msgstr "Horaire"
-
 #~ msgid "_Audio"
 #~ msgstr "_Audio"
 
-#~ msgid "_Display"
-#~ msgstr "_Affichage"
-
 #~ msgid "_Mail"
 #~ msgstr "_Courrier"
 
@@ -9745,9 +13439,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "event-editor-dialog"
 #~ msgstr "event-editor-dialog"
 
-#~ msgid "Show all hidden"
-#~ msgstr "Afficher tous les cach�s"
-
 #~ msgid "Hide selected"
 #~ msgstr "Cacher s�lectionn�"
 
@@ -9760,9 +13451,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Hide from Sender"
 #~ msgstr "Cacher de l'exp�diteur"
 
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Cacher le sujet \"%s\""
-
 #~ msgid "Hide from Sender <%s>"
 #~ msgstr "Cacher depuis l'exp�diteur <%s>"
 
@@ -9772,9 +13460,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Reply-to:"
 #~ msgstr "R�pondre-� :"
 
-#~ msgid " for "
-#~ msgstr " pour "
-
 #~ msgid "Open a calendar"
 #~ msgstr "Ouvre un calendrier"
 
@@ -9789,9 +13474,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "Radio"
 
-#~ msgid "_Replace..."
-#~ msgstr "_Remplacer..."
-
 #~ msgid "_Source"
 #~ msgstr "_Source"
 
@@ -9810,9 +13492,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Signature File"
 #~ msgstr "Fichier de signature"
 
-#~ msgid "Server:"
-#~ msgstr "Serveur :"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Type de source de courrier :"
 
@@ -9856,9 +13535,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "�diter source"
 
-#~ msgid "Add News Server"
-#~ msgstr "Ajouter un serveur de news"
-
 #~ msgid "Edit News Server"
 #~ msgstr "�diter le serveur de news"
 
@@ -9880,15 +13556,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Mail Transport"
 #~ msgstr "Transport de courrier"
 
-#~ msgid "News Servers"
-#~ msgstr "Serveur de forums"
-
 #~ msgid "News Sources"
 #~ msgstr "Sources de forums"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Envoie les messages au format HTML"
-
 #~ msgid "External Directories"
 #~ msgstr "Annuaires externes"
 
@@ -9913,9 +13583,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "�l�ment '� faire' qui n'est pas encore termin� :"
 
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "�l�ment '� faire' qui finit aujourd'hui :"
-
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "�l�ment '� faire' en retard : "
 
@@ -9940,15 +13607,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "aller. Quand vous cliquez sur un jour, vous\n"
 #~ "y serez automatiquement amen�."
 
-#~ msgid "Mail Source"
-#~ msgstr "Source de courrier"
-
 #~ msgid "Sending a message without a subject"
 #~ msgstr "Exp�dition d'un message sans sujet"
 
-#~ msgid "Send a message without a subject"
-#~ msgstr "Envoie un message sans sujet"
-
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Nettoie \"%s\""
 
@@ -10001,9 +13662,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Clearing message display"
 #~ msgstr "Nettoie l'affichage des messages"
 
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Affiche le message UID \"%s\""
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Ouverture des messages du dossier \"%s\""
 
@@ -10054,9 +13712,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "tuesday"
 #~ msgstr "mardi"
 
-#~ msgid "tues"
-#~ msgstr "mar"
-
 #~ msgid "wednesday"
 #~ msgstr "mercredi"
 
@@ -10096,9 +13751,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "today"
 #~ msgstr "aujourd'hui"
 
-#~ msgid "last"
-#~ msgstr "dernier"
-
 #~ msgid "this"
 #~ msgstr "ce"
 
@@ -10111,9 +13763,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "third"
 #~ msgstr "troisi�me"
 
-#~ msgid "fourth"
-#~ msgstr "quatri�me"
-
 #~ msgid "fifth"
 #~ msgstr "cinqui�me"
 
@@ -10123,9 +13772,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "seventh"
 #~ msgstr "septi�me"
 
-#~ msgid "eighth"
-#~ msgstr "huiti�me"
-
 #~ msgid "ninth"
 #~ msgstr "neuvi�me"
 
@@ -10138,15 +13784,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "twelfth"
 #~ msgstr "douzi�me"
 
-#~ msgid "ago"
-#~ msgstr "pass�"
-
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-#~ msgid "window2"
-#~ msgstr "fen�tre2"
-
 #~ msgid "_Summary:"
 #~ msgstr "R�s_um� : "
 
@@ -10225,9 +13865,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "End on "
 #~ msgstr "Fin le "
 
-#~ msgid "Change"
-#~ msgstr "Changer"
-
 #~ msgid "Create to-do item"
 #~ msgstr "Cr�er un �l�ment '� faire'"
 
@@ -10252,9 +13889,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Weeks start on"
 #~ msgstr "Les semaines d�butent un"
 
-#~ msgid "Day range"
-#~ msgstr "Horaires de travail"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10269,12 +13903,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Day start:"
 #~ msgstr "Heure de d�but : "
 
-#~ msgid "Day end:"
-#~ msgstr "Heure de fin : "
-
-#~ msgid "Colors for display"
-#~ msgstr "Couleurs pour l'affichage"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Afficher dans la liste '� Faire' : "
 
@@ -10358,14 +13986,8 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Ne connait pas le protocole pour ouvrir l'URI � %s �"
 
-#~ msgid "Forward Message"
-#~ msgstr "Faire suivre le message"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copier le message"
 
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Cr�er un nouveau dossier..."
-
 #~ msgid "_Unselect All"
 #~ msgstr "_D�selectionner tout"
diff --git a/po/ga.po b/po/ga.po
index 5a7b7436e9..b99a5b966b 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
 "Last-Translator: Alastair McKinstry, <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,26 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Post an sce�l seo"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +254,10 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr ""
 
@@ -260,14 +270,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -276,730 +286,850 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-msgid "General"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
+msgid "File"
+msgstr "_Fillte�n"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-#, fuzzy
-msgid "_Company:"
-msgstr "Greamaigh"
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
-#, fuzzy
-msgid "_Delete"
-msgstr "Scr�os"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
-#, fuzzy
-msgid "_Home"
-msgstr "_Nota"
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "Tosa�ocht"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#, fuzzy
-msgid "Delete Contact?"
-msgstr "Scr�os an sceal seo"
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-msgid "This contact belongs to these categories:"
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-msgid "Assistant"
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
-msgid "Business"
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-msgid "Business 2"
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
-msgid "Business Fax"
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-msgid "Callback"
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
-msgid "Car"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/component/addressbook-config.glade.h:2
 #, fuzzy
-msgid "Company"
-msgstr "Greamaigh"
+msgid "De_lete"
+msgstr "Scr�os"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
-msgid "Home"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-msgid "Home 2"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
-msgid "Home Fax"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
-msgid "ISDN"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-msgid "Mobile"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
-msgid "Other"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
-msgid "Other Fax"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
-msgid "Pager"
+#: addressbook/gui/component/addressbook.c:380
+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/contact-editor/e-contact-editor.c:1257
-#, fuzzy
-msgid "Primary"
-msgstr "Tosa�ocht"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
-msgid "Radio"
+#: addressbook/gui/component/addressbook.c:393
+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/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
-msgid "Telex"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
-msgid "TTY/TDD"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Abair"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
-msgid "Contact Quick-Add"
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
-#, fuzzy
-msgid "Edit Full"
-msgstr "_Fillte�n"
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
-msgid "Full Name"
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/component/e-address-popup.c:579
 #, fuzzy
-msgid "E-mail"
-msgstr "Post"
+msgid "Select an Action"
+msgstr "Fillte�n _Nua"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr ""
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Scr�os an sceal seo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#, fuzzy
-msgid "_City:"
-msgstr "Tosa�ocht"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Scr�os"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Scr�os"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Post"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "_Coinne"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Select Names"
+msgstr "Fillte�n _Nua"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Fillte�n _Nua"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Tosa�ocht"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "_Fillte�n"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#, fuzzy
+msgid "No_tes:"
+msgstr "_Nota"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Delete"
+msgstr "Scr�os"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Home"
+msgstr "_Nota"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "File"
-msgstr "_Fillte�n"
+msgid "Delete Contact?"
+msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+msgid "Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+msgid "Car"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#, fuzzy
+msgid "Company"
+msgstr "Greamaigh"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+msgid "Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
+msgid "Other"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+msgid "Pager"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
-msgid "Port:"
+msgid "Primary"
 msgstr "Tosa�ocht"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
+msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
+msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#, fuzzy
+msgid "Edit Full"
+msgstr "_Fillte�n"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
+msgid "E-mail"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "Tosa�ocht"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Scr�os"
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Fillte�n _Nua"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Post"
+
+#: 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 ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Scr�os"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Scr�os"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Remove All"
-msgstr "Scr�os"
+msgid "New Contact:"
+msgstr "_Coinne"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#, fuzzy
-msgid "Find..."
-msgstr "Priont�il"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: 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?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Select Names"
-msgstr "Fillte�n _Nua"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select name from:"
-msgstr "Fillte�n _Nua"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1113,165 +1243,248 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "_Post sce�l"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Priont�il"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Post an sce�l seo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+msgid "Error modifying card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "_Fillte�n"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "_Fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "Post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Tosa�ocht"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_Fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "_Nota"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1310,7 +1523,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:7
 #, fuzzy
-msgid "Font..."
+msgid "F_ont..."
 msgstr "Priont�il"
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1373,7 +1586,6 @@ msgid "Margins"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr ""
 
@@ -1460,142 +1672,316 @@ msgstr "Do:"
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Priont�il"
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "_Fillte�n"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "M�id"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+#, fuzzy
+msgid "Snooze"
+msgstr "M�id"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+msgid "Could not initialize gnome-vfs"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:402
+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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 #, fuzzy
 msgid "Private"
 msgstr "Priont�il"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 #, fuzzy
 msgid "Normal"
 msgstr "Sheoladh Chuig duine"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1603,165 +1989,314 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 #, fuzzy
 msgid "None"
 msgstr "_Nota"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "_Nota"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Nua"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Priont�il"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-#, fuzzy
-msgid "Show appointments"
-msgstr "_Coinne"
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
-msgid "Snooze"
-msgstr "M�id"
+msgid "Message to Display"
+msgstr "_Post sce�l"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:301
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.c:306
 #, fuzzy
-msgid "Edit appointment"
+msgid "1 second"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "_Post sce�l"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Scr�os"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Reminders"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Osc�il"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "_Coinne"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr ""
@@ -1791,38 +2326,37 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+#, fuzzy
+msgid "Calendar"
+msgstr "_Fillte�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
+msgid "Calendar Preferences"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Calendar"
-msgstr "_Fillte�n"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
+msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors"
-msgstr "_Fillte�n"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1831,1048 +2365,1146 @@ msgid "Defaults"
 msgstr "Scr�os"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
+msgid "End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+msgid "First day of week:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
+msgid "Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
-msgid "Friday"
+msgid "Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
+#, fuzzy
+msgid "Remind me of all appointments"
+msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
+msgid "Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
-msgid "Monday"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr ""
+#, fuzzy
+msgid "Show appointment end times in week and month views"
+msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
+msgid "Start of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Tosa�ocht"
+msgid "Sun"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 #, fuzzy
-msgid "Remind me of all appointments"
-msgstr "_Coinne"
+msgid "Sunday"
+msgstr "Post"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
-msgid "Reminders"
-msgstr "Post"
+msgid "Task List"
+msgstr "_Teacs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
+msgid "Tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
-msgid "Saturday"
+msgid "Thu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Show appointment end times"
-msgstr "_Coinne"
+msgid "Time"
+msgstr "_Fillte�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
+msgid "Time zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
-#, fuzzy
-msgid "Sunday"
-msgstr "Post"
+msgid "Tue"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
-msgid "TaskPad"
-msgstr "_Teacs"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
+msgid "Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
-msgid "Thursday"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
-msgid "Tuesday"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
-msgid "Wednesday"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "seconds."
-msgstr "Post"
-
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "_Nota"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "_Nota"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/comp-editor.c:449
 #, fuzzy
-msgid "Pri_vate"
-msgstr "Priont�il"
+msgid "Edit Appointment"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "Post"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-#, fuzzy
-msgid "Task"
-msgstr "_Teacs"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-msgid "_Priority:"
-msgstr "Tosa�ocht"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "_Coinne"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Task - %s"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Journal entry - %s"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr ""
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "_Coinne"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/dialogs/event-editor.c:159
 #, fuzzy
-msgid "Summary"
+msgid "Reminder"
 msgstr "Post"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Priont�il"
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:558
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Edit the task"
-msgstr "Scr�os an sceal seo"
+msgid "Needs Action"
+msgstr "Scr�os"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Delete this task"
-msgstr "Scr�os an sceal seo"
+msgid "Declined"
+msgstr "Scr�os"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:561
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Delete the task"
-msgstr "Scr�os an sceal seo"
+msgid "Delegated"
+msgstr "Scr�os"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 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:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
-msgid "New Appointment"
-msgstr "_Coinne"
+msgid "Sent By:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Scr�os"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-#, fuzzy
-msgid "Go to Today"
-msgstr "S�bh�il 'san _fillte�n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 #, fuzzy
-msgid "Go to Date..."
-msgstr "S�bh�il 'san _fillte�n"
+msgid "Delegated From"
+msgstr "Scr�os"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 #, fuzzy
-msgid "Open"
-msgstr "_Osc�il"
+msgid "Delegated To"
+msgstr "Scr�os"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-#, fuzzy
-msgid "Delete this Appointment"
-msgstr "Scr�os an sceal seo"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-#, fuzzy
-msgid "Make this Occurrence Movable"
-msgstr "Scr�os an sceal seo"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 #, fuzzy
-msgid "Delete this Occurrence"
-msgstr "Scr�os an sceal seo"
+msgid "Role"
+msgstr "Scr�os"
 
-#: calendar/gui/e-day-view.c:3179
-#, fuzzy
-msgid "Delete all Occurrences"
-msgstr "Scr�os an sceal seo"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid " Decline "
-msgstr "Scr�os"
+msgid "Exceptions"
+msgstr "_Osc�il"
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-#, fuzzy
-msgid "Calendar Message"
-msgstr "Post an sce�l seo"
-
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
-#, fuzzy
-msgid "Date:"
-msgstr "Scr�os"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
-#, fuzzy
-msgid "Server Message:"
-msgstr "Post"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:11
-#, fuzzy
-msgid "Summary:"
-msgstr "Post"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Scr�os"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Scr�os"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "_Nota"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
+#: calendar/gui/dialogs/task-editor.c:130
+#, fuzzy
+msgid "Task"
+msgstr "_Teacs"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-page.glade.h:22
+#, fuzzy
+msgid "_Priority:"
+msgstr "Tosa�ocht"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-#, fuzzy
-msgid "Role"
-msgstr "Scr�os"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "90%"
 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/e-week-view-main-item.c:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "New Appointment..."
-msgstr "_Coinne"
+msgid "_Open"
+msgstr "_Osc�il"
 
-#: calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Scr�os an sceal seo"
+msgid "C_ut"
+msgstr "Gearr"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
+msgstr "Greamaigh"
 
-#: calendar/gui/event-editor-dialog.glade.h:3
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
 #, fuzzy
-msgid "Appointment"
-msgstr "_Coinne"
+msgid "_Paste"
+msgstr "Priont�il"
 
-#: calendar/gui/event-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Appointment Basics"
-msgstr "_Coinne"
+msgid "_Mark as Complete"
+msgstr "_Post sce�l"
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "_Post sce�l"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
-msgid "Exceptions"
-msgstr "_Osc�il"
+msgid "_Delete Selected Tasks"
+msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "_Nota"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "_Nota"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#, fuzzy
-msgid "Reminder"
-msgstr "Post"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Tosa�ocht"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
-msgid "Send an email"
+msgid "Summary"
 msgstr "Post"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "_Teacs"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
+#. 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:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
+#. 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:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "end of appointment"
+msgid "New _Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr ""
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "S�bh�il 'san _fillte�n"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr ""
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr ""
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "start of appointment"
-msgstr "_Coinne"
+msgid "Delete this _Occurrence"
+msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "_Coinne"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
-msgid "on the"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+msgid "The message is not understandable."
 msgstr ""
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "Post"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1556
-#, fuzzy
-msgid " 1 second"
-msgstr "Post"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-#, fuzzy
-msgid " before start of appointment"
-msgstr "Scr�os an sceal seo"
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1605
-#, fuzzy
-msgid " after start of appointment"
-msgstr "Scr�os an sceal seo"
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid " before end of appointment"
-msgstr "Scr�os an sceal seo"
+msgid "Calendar Message"
+msgstr "Post an sce�l seo"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
-msgid " after end of appointment"
-msgstr "_Coinne"
+msgid "Date:"
+msgstr "Scr�os"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Post"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "_Coinne"
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2898,238 +3530,256 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
+msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
+#, fuzzy
+msgid "_Go To Today"
+msgstr "S�bh�il 'san _fillte�n"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 #, fuzzy
 msgid "Fr"
 msgstr "�:"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "_Teacs"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "Priont�il"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3165,85 +3815,104 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Fillte�n _Nua"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "_Nota"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3275,14 +3944,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3297,113 +3985,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr ""
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3422,37 +4105,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3549,145 +4232,238 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "_Teacs"
+msgid "Failed to decode message."
+msgstr "_Post sce�l"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Abair"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Fillte�n _Nua"
+msgid "Scanning for changed messages"
+msgstr "_Post sce�l"
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "_Post sce�l"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3696,7 +4472,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "Fillte�n _Nua"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 #, fuzzy
 msgid "Folders"
 msgstr "_Fillte�n"
@@ -3730,28 +4506,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3759,117 +4535,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
-#, c-format
-msgid "%s is not a selectable folder"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3877,14 +4662,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3892,28 +4677,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+
+#: 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 ""
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3923,20 +4721,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3975,82 +4778,99 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -4060,39 +4880,97 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4105,24 +4983,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4132,21 +5010,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr "_Post sce�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "_Post sce�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "Post an sce�l seo"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4166,7 +5054,7 @@ msgstr "_Post sce�l"
 msgid "Delete after %s day(s)"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4194,53 +5082,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
@@ -4293,7 +5186,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4301,124 +5194,124 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Post"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4426,192 +5319,196 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Post an sce�l seo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytanna"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "Post"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 #, fuzzy
 msgid "From:"
 msgstr "�:"
@@ -4619,7 +5516,7 @@ msgstr "�:"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Freagrair"
@@ -4627,121 +5524,155 @@ msgstr "Freagrair"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:883
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+#: composer/e-msg-composer.c:1047
+#, c-format
+msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:908
-msgid "Open file"
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1061
+#, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr ""
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "_Post sce�l"
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1321
 msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sce�l seo"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -4758,307 +5689,134 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Post"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Fillte�n _Nua"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Fillte�n _Nua"
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Post"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "Post"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: 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"
@@ -5066,28 +5824,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5096,11 +5862,11 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr ""
 
@@ -5110,28 +5876,28 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5143,26 +5909,45 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -5206,373 +5991,509 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr ""
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Scr�os"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "Scr�os"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
-msgid "Expression"
+#: filter/libfilter-i18n.h:22
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
+#: filter/libfilter-i18n.h:23
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "_Nota"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "Is"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "Scr�os"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: 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:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "Post"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "M�id"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Abair"
 
-#: filter/libfilter-i18n.h:38
-msgid "contains"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Scr�os"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "_Fillte�n"
+
+#: filter/score-editor.c:130
+msgid "Score Rules"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Post"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Post"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Post"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
 msgstr ""
 
-#: filter/score-editor.c:130
-msgid "Score Rules"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Priont�il"
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr ""
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Abair"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
+msgstr "Abair"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr ""
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
+msgstr "Abair"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "Abair"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "Abair"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "Post"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr ""
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "_Save As..."
+msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr ""
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "_Print"
+msgstr "Priont�il"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
-msgstr ""
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "Freagrair"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
-msgstr "Sheoladh Chuig duine"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Freagrair"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 #, fuzzy
-msgid "Forward inline"
+msgid "Reply to _All"
+msgstr "Freagrair"
+
+#: mail/folder-browser.c:1288
+#, fuzzy
+msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr ""
+
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr ""
+
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Move to Folder..."
+msgid "_Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr ""
+#: mail/folder-browser.c:1304
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Fillte�n"
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
-msgid "Undelete"
+msgid "_Undelete"
 msgstr "Scr�os"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+msgid "Add Sender to Address Book"
+msgstr ""
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
+msgstr "Post an sce�l seo"
+
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
@@ -5608,39 +6529,66 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: 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 ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr ""
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Fillte�n _Nua"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Scr�os"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Scr�os"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: 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 OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -5663,11 +6611,11 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5675,100 +6623,157 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1463
+msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Fillte�n"
+
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5782,35 +6787,64 @@ msgid " color"
 msgstr "_Fillte�n"
 
 #: mail/mail-config.glade.h:3
-msgid "Account"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Management"
+msgid "Account Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "_Osc�il"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "_Nota"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5820,439 +6854,579 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Scr�os"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "_Nota"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Scr�os"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Priont�il"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "Fillte�n _Nua"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:57
+msgid "NNTP Server:"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "_Nua"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Nota"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "_Post sce�l"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "Source Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "_Fillte�n"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "Post"
+
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-display.c:295
-msgid "Save to Disk..."
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
+msgstr ""
+
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Save as (FIXME)"
-msgstr "_Post sce�l"
+msgid "Loading message content"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1406
 #, fuzzy
-msgid "Copy location (FIXME)"
+msgid "Copy Link Location"
 msgstr "_Coinne"
 
-#: mail/mail-format.c:518
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "_Post sce�l"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "S�bh�il 'san _fillte�n"
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "Post"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "Post an sce�l seo"
+msgid "Date"
+msgstr "Scr�os"
+
+#: mail/mail-format.c:842
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "�:"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Freagrair"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#, fuzzy
+msgid "To"
+msgstr "Do:"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "Post an sce�l seo"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "Fillte�n _Nua"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:908
-#, fuzzy
-msgid "Copying messages"
-msgstr "_Post sce�l"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Fillte�n _Nua"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-#, fuzzy
-msgid "Sending message"
-msgstr "Post an sce�l seo"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "_Post sce�l"
@@ -6267,288 +7441,287 @@ msgstr "_Post sce�l"
 msgid "Copying messages to %s"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "_Teacs"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Fillte�n _Nua"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Fillte�n _Nua"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1550
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1634
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
-msgstr "_Fillte�n"
+msgid "(Untitled Message)"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Post sce�l"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "_Post sce�l"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Priont�il"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Scr�os"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr ""
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "Post"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr ""
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr ""
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "_Post sce�l"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Post an sce�l seo"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "_Fillte�n"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr "Freagrair"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
-msgstr ""
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
-msgstr ""
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
-msgstr ""
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
-msgstr ""
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Scr�os an sceal seo"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "From"
-msgstr "�:"
+msgid "Updating message list"
+msgstr "_Post sce�l"
 
-#: mail/message-list.c:1053
-#, fuzzy
-msgid "Date"
-msgstr "Scr�os"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1054
-#, fuzzy
-msgid "To"
-msgstr "Do:"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 #, fuzzy
 msgid "Size"
 msgstr "M�id"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_Fillte�n"
@@ -6577,157 +7750,1428 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Folder name:"
-msgstr "_Fillte�n"
+msgid "Appointments"
+msgstr "_Coinne"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/e-summary-calendar.c:177
 #, fuzzy
-msgid "Folder type:"
+msgid "No appointments"
+msgstr "_Coinne"
+
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Post"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "_Teacs"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Post"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
+msgstr ""
+
+#: my-evolution/main.c:52
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr ""
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
 msgstr "_Fillte�n"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/metar.c:47
+msgid "Few clouds"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/metar.c:48
+msgid "Overcast"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/metar.c:63
+msgid "Variable"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
 msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Priont�il"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
 msgstr ""
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:65
+msgid "Southeast"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
 msgstr ""
 
-#: shell/importer/importer.c:523
+#: my-evolution/metar.c:66
 #, fuzzy
-msgid "Filename:"
+msgid "South"
+msgstr "Priont�il"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "M�id"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Post"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Post"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Tosa�ocht"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Post"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Post"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+msgid "Sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
 msgstr "_Fillte�n"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Display folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Select a file"
-msgstr "Fillte�n _Nua"
+msgid "Five days"
+msgstr "_Fillte�n"
 
-#: shell/importer/importer.c:538
-msgid "File type:"
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Post"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One month"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Post an sce�l seo"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "_Teacs"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Post"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr ""
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "_Fillte�n"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6735,14 +9179,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6750,7 +9194,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6758,249 +9211,534 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "_Fillte�n"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Fillte�n _Nua"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Scr�os an sceal seo"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:319
+#: shell/e-shell-folder-selection-dialog.c:343
 #, fuzzy
 msgid "New..."
 msgstr "_Nua"
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "_Fillte�n"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Fillte�n _Nua"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr ""
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Fillte�n _Nua"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "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:374
+#: shell/e-shell-view-menu.c:437
 #, fuzzy
 msgid "Go to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Scr�os an sceal seo"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Sheoladh Chuig duine"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+msgid "Rename Shortcut Group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+msgid "Re_name this Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:336
+msgid "Rename this shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
+#: shell/e-shortcuts-view.c:461
+msgid "Rename shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Osc�il"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Post an sce�l seo"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Scr�os"
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-#, fuzzy
-msgid "_View"
-msgstr "_Nua"
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
+msgstr ""
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Coinne"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
-msgid "The Evolution shell."
+msgid "Folder name:"
+msgstr "_Fillte�n"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_Fillte�n"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
 msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Post an sce�l seo"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7008,261 +9746,338 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Greamaigh"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:4
+msgid "Create new contact"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:5
 #, fuzzy
-msgid "Delete a contact"
+msgid "Create new contact list"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Gearr"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
-msgid "New contact"
-msgstr "_Coinne"
+msgid "Delete selected contacts"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Previews the message to be printed"
-msgstr "Post an sce�l seo"
+msgid "New contact"
+msgstr "_Coinne"
 
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
-msgstr ""
+#, fuzzy
+msgid "New list"
+msgstr "_Nua"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
-msgid "Stop"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#, fuzzy
+msgid "Paste"
+msgstr "Priont�il"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "Stop Loading"
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:14
 #, fuzzy
-msgid "View All"
-msgstr "_Nua"
+msgid "Previews the contacts to be printed"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:21
+msgid "Stop Loading"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Coinne"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
 msgstr "Priont�il"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Uirlis�"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr ""
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Month"
-msgstr "Priont�il"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
+msgid "New Appointment"
+msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr ""
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Post an sce�l seo"
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
+msgid "Print calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
-msgid "Prev"
+msgid "Print this Calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "Previews the calendar to be printed"
-msgstr "Post an sce�l seo"
+msgid "Publish Free/Busy Information"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
-msgid "Print calendar"
+msgid "Show 1 month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-#, fuzzy
-msgid "Save As"
-msgstr "S�bh�il 'san _fillte�n"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
-msgid "Show 1 day"
-msgstr ""
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
+msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:30
+msgid "_Calendar Settings..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "Show 1 week"
+msgid "_Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr ""
+#, fuzzy
+msgid "_Month"
+msgstr "Priont�il"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "W_ork Week"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
+#: ui/evolution-comp-editor.xml.h:3
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-comp-editor.xml.h:5
+#, fuzzy
+msgid "Delete this appointment"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "_Appointment"
-msgstr "_Coinne"
+msgid "Preview the printed item"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Day"
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-comp-editor.xml.h:11
 #, fuzzy
-msgid "_Month"
+msgid "Print S_etup"
 msgstr "Priont�il"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nua"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#, fuzzy
+msgid "Print this item"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#, fuzzy
+msgid "Print..."
+msgstr "Priont�il"
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "_Save As..."
-msgstr "S�bh�il 'san _fillte�n"
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
 msgstr ""
 
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Osc�il"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_File"
+msgstr "_Fillte�n"
+
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
 msgstr "Scr�os an sceal seo"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete..."
 msgstr "Scr�os"
@@ -7276,30 +10091,13 @@ msgstr ""
 msgid "Print En_velope..."
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-#, fuzzy
-msgid "Print this item"
-msgstr "Scr�os an sceal seo"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-#, fuzzy
-msgid "Print..."
-msgstr "Priont�il"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -7317,1003 +10115,1002 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "_Post sce�l"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-#, fuzzy
-msgid "_File"
-msgstr "_Fillte�n"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:2
 #, fuzzy
-msgid "Address _Book... (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-#, fuzzy
-msgid "C_lear"
-msgstr "_Fillte�n"
+msgid "Delete this list"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-#, fuzzy
-msgid "C_ut"
-msgstr "Gearr"
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
+msgid "Se_nd list to other..."
 msgstr "_Post sce�l"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "Clear"
-msgstr "_Fillte�n"
+msgid "Send _message to list..."
+msgstr "_Post sce�l"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-#, fuzzy
-msgid "Close this appointment"
-msgstr "Scr�os an sceal seo"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Greamaigh"
+msgid "Forward as i_Calendar"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Gearr"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "Scr�os an sceal seo"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 #, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
+msgid "_Actions"
+msgstr "_Osc�il"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "Sheoladh Chuig duine"
+msgid "Customise My Evolution"
+msgstr "Evolution"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-#, fuzzy
-msgid "Paste"
-msgstr "Priont�il"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-#, fuzzy
-msgid "Print S_etup..."
-msgstr "Priont�il"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "Print Setup"
-msgstr "Priont�il"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Fillte�n _Nua"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Select All"
-msgstr "Fillte�n _Nua"
+msgid "_Filters..."
+msgstr "_Fillte�n"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "Select everything"
-msgstr "Fillte�n _Nua"
+msgid "_Mail Message"
+msgstr "_Post sce�l"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-#, fuzzy
-msgid "_About..."
-msgstr "Evolution"
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_Coinne"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-#, fuzzy
-msgid "_Copy"
-msgstr "Greamaigh"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "_Help"
-msgstr "_Nota"
+msgid "Copy selected messages"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_Coinne"
+msgid "Cut selected messages"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Coinne"
+msgid "Hide S_elected Messages"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
+msgid "Hide _Deleted Messages"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Post sce�l"
+msgid "Hide _Read Messages"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-#, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-#, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Coinne"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-#, fuzzy
-msgid "_Paste"
-msgstr "Priont�il"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-#, fuzzy
-msgid "_Print"
-msgstr "Priont�il"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
-msgid "_Properties..."
-msgstr "Priont�il"
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Fillte�n _Nua"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 #, fuzzy
-msgid "_Select All"
+msgid "Select _All"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Task (FIXME)"
-msgstr "_Post sce�l"
+msgid "Select all visible messages"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Coinne"
+msgid "Show _All"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Fillte�n"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "_Properties..."
+msgstr "Priont�il"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
-msgid "Compose a new message"
+msgid "_Threaded Message List"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "S�bh�il 'san _fillte�n"
+msgid "Apply filter rules to the selected messages"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:2
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
-#, fuzzy
-msgid "Delete the selected messages"
-msgstr "Scr�os an sceal seo"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-#, fuzzy
-msgid "Edit Message"
-msgstr "_Post sce�l"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Filter on _Subject"
-msgstr "Abair"
+msgid "Display the next message"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Forward As"
-msgstr "Sheoladh Chuig duine"
+msgid "Display the previous message"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Full _Headers"
-msgstr "_Fillte�n"
+msgid "Filter on Se_nder..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Scr�os an sceal seo"
+msgid "Filter on _Recipients..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Hide S_elected Messages"
-msgstr "Scr�os an sceal seo"
+msgid "Filter on _Subject..."
+msgstr "Abair"
+
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Scr�os an sceal seo"
+msgid "Forward As"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Post an sce�l seo"
+msgid "Forward _Attached"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Move"
-msgstr "Scr�os"
+msgid "Mark the selected messages as unimportant"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Move message to a new folder"
+msgid "Mark the selected messages for deletion"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
+#, fuzzy
+msgid "Move"
+msgstr "Scr�os"
+
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "_Post sce�l"
+
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Unread Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-msgid "Print Preview of message..."
+msgid "Open the selected message in a new window"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Print message..."
+msgid "Previews the message to be printed"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Reply to _All"
-msgstr "Freagrair"
+msgid "Previous Important Message"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Reply to all"
-msgstr "Freagrair"
+msgid "Previous Message"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to sender"
-msgstr "Freagrair"
+msgid "Previous Unread Message"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Save the message into a new file"
+msgid "Print Preview..."
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Select _All"
-msgstr "Fillte�n _Nua"
+msgid "Print this message"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:70
-msgid "Select _Thread"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Freagrair"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Send / Receive"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "Post"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid "Show _All"
-msgstr "Post an sce�l seo"
+msgid "Show Full _Headers"
+msgstr "_Fillte�n"
+
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Post an sce�l seo"
+msgid "Show message with all email headers"
+msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:78
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on Se_nder..."
 msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:86
-msgid "Virtual Folder _Editor..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "_Coinne"
-
-#: ui/evolution-mail.xml.h:89
-#, fuzzy
-msgid "_Copy to Folder..."
+msgid "_Copy to Folder"
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_Fillte�n"
-
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Fillte�n"
-
-#: ui/evolution-mail.xml.h:95
-#, fuzzy
-msgid "_Forward"
+msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Mail Message"
+msgid "_Message Display"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:100
-#, fuzzy
-msgid "_Move to Folder..."
-msgstr "S�bh�il 'san _fillte�n"
-
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "Scr�os an sceal seo"
+msgid "_Move to Folder"
+msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail.xml.h:103
-#, fuzzy
-msgid "_Quoted"
-msgstr "_Nota"
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Reply"
-msgstr "Freagrair"
+msgid "_Open Message"
+msgstr "_Post sce�l"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Resend Messages"
+msgid "_Re-send Message"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail.xml.h:107
-#, fuzzy
-msgid "_Save Message As..."
-msgstr "S�bh�il 'san _fillte�n"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Send / Receive"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 #, fuzzy
-msgid "_Undelete"
-msgstr "Scr�os"
+msgid "_View"
+msgstr "_Nua"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
+msgid "Delete all but signature"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-message-composer.xml.h:6
+#, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
+msgid "Save As"
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send the message now"
-msgstr "Post an sce�l seo"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Coinne"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+#, fuzzy
+msgid "_Delete all"
+msgstr "Scr�os"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-#, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "S�bh�il 'san _fillte�n"
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
 msgstr "_Osc�il"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Freagrair"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "_Nota"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 #, fuzzy
 msgid "F_older"
 msgstr "_Fillte�n"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Redo"
-msgstr "Scr�os"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "Scr�os"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "Replace"
-msgstr "Freagrair"
+msgid "Cancel Task"
+msgstr "_Teacs"
 
-#: ui/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "Replace a string"
-msgstr "Freagrair"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr ""
+msgid "Delegate Task"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Leas�"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
+msgid "Copy selected task"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "_Post sce�l"
+msgid "Create a new task"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr ""
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "Create a new task"
+msgid "Delete selected tasks"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "_Teacs"
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
+#: ui/evolution-tasks.xml.h:9
+msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Post"
+
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "_Teacs"
@@ -8323,326 +11120,498 @@ msgstr "_Teacs"
 msgid "About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr ""
+#, fuzzy
+msgid "Copy this folder"
+msgstr "_Fillte�n"
 
 #: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr ""
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Fillte�n _Nua"
 
 #: ui/evolution.xml.h:8
-msgid "E_xit"
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
 #: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:15
+msgid "E_xit"
+msgstr ""
+
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Post an sce�l seo"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Scr�os"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Actions"
-msgstr "_Osc�il"
+msgid "_Appointment (FIXME)"
+msgstr "_Coinne"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Greamaigh"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Fillte�n"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "_Fillte�n"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import file..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Post sce�l"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Scr�os"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nua"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Osc�il"
+
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr ""
 
+#: ui/evolution.xml.h:61
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "_Post sce�l"
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Evolution"
+
+#: views/addressbook/galview.xml.h:1
+msgid "Address Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Greamaigh"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Post"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Abair"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Post sce�l"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 #, fuzzy
 msgid "_Options"
 msgstr "_Osc�il"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
-msgid "Now"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
-msgid "Save Search"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:237
-msgid "Advanced Search"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-charset-picker.c:66
 #, fuzzy
-msgid "Message"
-msgstr "_Post sce�l"
+msgid "Turkish"
+msgstr "_Teacs"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
 #, fuzzy
-msgid "Don't show this message again."
-msgstr "Post an sce�l seo"
+msgid "Traditional"
+msgstr "_Osc�il"
 
-#: widgets/misc/e-search-bar.c:148
-msgid "Sear_ch"
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:2
+#: widgets/misc/e-charset-picker.c:102
 #, fuzzy
-msgid "By Company"
-msgstr "Greamaigh"
+msgid "New"
+msgstr "_Nua"
 
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
 #, fuzzy
-msgid "By Sender"
-msgstr "Post"
+msgid "Other..."
+msgstr "_Osc�il"
 
-#: views/mail/galview.xml.h:2
-msgid "By Status"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
 msgstr ""
 
-#: views/mail/galview.xml.h:3
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:157
 #, fuzzy
-msgid "By Subject"
-msgstr "Abair"
+msgid "Search Editor"
+msgstr "_Fillte�n"
 
-#: views/mail/galview.xml.h:4
+#: widgets/misc/e-filter-bar.c:173
+msgid "Save Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:241
+msgid "Advanced Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
-msgid "Messages"
+msgid "Message"
 msgstr "_Post sce�l"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Post an sce�l seo"
+
+#: widgets/misc/e-search-bar.c:155
+msgid "Sear_ch"
 msgstr ""
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
@@ -8666,40 +11635,179 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Remove action"
-#~ msgstr "Scr�os"
+#~ msgid "_Company:"
+#~ msgstr "Greamaigh"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "_Teacs"
+
+#, fuzzy
+#~ msgid "Edit the task"
+#~ msgstr "Scr�os an sceal seo"
+
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Scr�os an sceal seo"
+
+#, fuzzy
+#~ msgid "Appointment Basics"
+#~ msgstr "_Coinne"
 
 #, fuzzy
-#~ msgid "Mail"
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Fillte�n _Nua"
+
+#, fuzzy
+#~ msgid "Send as:"
 #~ msgstr "Post"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_Osc�il"
+#~ msgid "Send an email to %s"
+#~ msgstr "Post"
 
 #, fuzzy
-#~ msgid "Select signature file"
+#~ msgid "Move %s to the left"
 #~ msgstr "Fillte�n _Nua"
 
 #, fuzzy
-#~ msgid "_Message Hiding"
+#~ msgid "RDF Summary"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "_Nota"
+
+#, fuzzy
+#~ msgid "Move to Folder..."
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "Copying messages"
 #~ msgstr "_Post sce�l"
 
 #, fuzzy
-#~ msgid "New"
+#~ msgid "View All"
 #~ msgstr "_Nua"
 
 #, fuzzy
-#~ msgid "Open..."
-#~ msgstr "_Osc�il"
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
 
 #, fuzzy
-#~ msgid "Save changes to message..."
+#~ msgid "C_lear"
+#~ msgstr "_Fillte�n"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Post sce�l"
+
+#, fuzzy
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Sheoladh Chuig duine"
+
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "Priont�il"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "Fillte�n _Nua"
+
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Post sce�l"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Scr�os an sceal seo"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair"
+
+#, fuzzy
+#~ msgid "_Reply"
+#~ msgstr "Freagrair"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "Send the message now"
 #~ msgstr "Post an sce�l seo"
 
 #, fuzzy
-#~ msgid "Subject contains"
-#~ msgstr "Abair"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "S�bh�il 'san _fillte�n"
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "Scr�os"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Scr�os"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Freagrair"
+
+#, fuzzy
+#~ msgid "Replace a string"
+#~ msgstr "Freagrair"
+
+#~ msgid "Undo"
+#~ msgstr "Leas�"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Post sce�l"
+
+#, fuzzy
+#~ msgid "Save changes to message..."
+#~ msgstr "Post an sce�l seo"
 
 #, fuzzy
 #~ msgid "FIXME: _Appointment"
@@ -8730,10 +11838,6 @@ msgstr ""
 #~ msgstr "_Post sce�l"
 
 #, fuzzy
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
 #~ msgid "FIXME: For_ward"
 #~ msgstr "Sheoladh Chuig duine"
 
@@ -8742,10 +11846,6 @@ msgstr ""
 #~ msgstr "Scr�os"
 
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Abair"
-
-#, fuzzy
 #~ msgid "_Undo"
 #~ msgstr "Leas�"
 
diff --git a/po/gl.po b/po/gl.po
index d590753168..ff2e326e2c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-04-26 00:03+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -20,11 +20,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "F�brica para importar ficheiros GnomeCard a Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importa ficheiros GnomeCard a Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -32,7 +42,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -40,7 +50,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -48,7 +58,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -56,7 +66,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -64,7 +74,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -72,7 +82,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -80,7 +90,7 @@ msgstr ""
 "\n"
 "Data de nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -88,7 +98,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -96,7 +106,7 @@ msgstr ""
 "\n"
 "  Apdo. de correos: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -104,7 +114,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -112,7 +122,7 @@ msgstr ""
 "\n"
 "  R�a:         "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -120,7 +130,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -128,7 +138,7 @@ msgstr ""
 "\n"
 "  Rexi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -136,7 +146,7 @@ msgstr ""
 "\n"
 "  C�digo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -144,7 +154,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -152,7 +162,7 @@ msgstr ""
 "\n"
 "Etiqueda de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -160,7 +170,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -168,7 +178,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "Correo electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "Cliente de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -208,7 +218,7 @@ msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -216,7 +226,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -224,7 +234,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -232,7 +242,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -248,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -256,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -264,7 +274,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -272,7 +282,7 @@ msgstr ""
 "\n"
 "Categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -290,7 +300,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -298,7 +308,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -306,27 +316,25 @@ msgstr ""
 "\n"
 "Clave p�blica: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "F�brica para importar ficheiros GnomeCard a Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "M�ltiples Mensaxes"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importa ficheiros GnomeCard a Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Introduza o contrasinal %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -339,14 +347,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
@@ -356,726 +364,848 @@ msgstr "Non foi posible iniciar wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n Enderezo de pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Un control de Bonobo para un men� emerxente de enderezo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un control de Bonobo para amosar un enderezo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Unha mostra de control de Bonobo que amosa un libro de enderezos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Compo�ente de Evolution para manexar contactos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "F�brica para o control da Minitarxeta do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "F�brica para o visor de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "F�brica para o men� emerxente do enderezo do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "F�brica para a mostra de control do Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Ficheiro"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo de libro de enderezos desco�ecido"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Ning�n (modo an�nimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo de autenticaci�n desco�ecido"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "�nico"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Sub�rbore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo de �mbito desco�ecido"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Asignar ND:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "AM��AME Texto de axuda para Asignar ND aqu�"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar este contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "AM��AME Texto de axuda para Servidor aqu�"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "ND Ra�z:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "AM��AME Texto de axuda para ND Ra�z aqu�"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porto:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "AM��AME Texto de axuda para Porto aqu�"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Buscar �mbito:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autenticaci�n:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Cami�o:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "AM��AME Texto de axuda para Cami�o aqu�"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Crear cami�o se non existe."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Engadir Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Elixe a clase de Libro de Enderezos que tes, e introduce a informaci�n "
+"relevante sobre el."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "AM��AME Texto de axuda para Nome aqu�"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descrici�n:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "AM��AME Texto de axuda para Descrici�n aqu�"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Engadir"
+msgid "Addressbook Sources"
+msgstr "Engadir Fontes para o Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Engadir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Introduza o contrasinal %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Calquera campo cont�n"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nome cont�n"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Enderezo cont�n"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nome cont�n"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "O URI que amosar� o Navegador de Cartafoles"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Correo electr�nico principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Correo Electr�nico 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Correo Electr�nico 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Seleccionar un ficheiro"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un novo contacto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Editar Informaci�n de Contacto"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Engadir a Contactos"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Enderezo de Correo-E:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Desactivar Petici�ns"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Activar Petici�ns (�Perigoso!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaz de selecci�n de nome do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+"F�brica para a interfaz de selecci�n de nome do Libro de Enderezos de "
+"Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Quitar Todos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Enviando Correo"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinatarios da mensaxe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleccionar nome desde:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categor�a:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_raballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax do traballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegor�as..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Arquivar como:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Novo tipo de tel�fono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizaci�n:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipos de tel�fono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Correo electr�nico principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Enderezo da p�xina Web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Engadir"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compa��a:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactos..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome do _Xestor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_M�bil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Sobrenome:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesi�n:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_C�nxuxe:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Este � o enderezo da lista de correo"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "�Borrar Contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categor�as:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Reincorporaci�n"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Autom�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Compa��a"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Correo Electr�nico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Correo Electr�nico 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "�Borrar Contacto?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "Correo Electr�nico"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprobar Enderezo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Pa�s:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Estados Unidos"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "C�digo _Postal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Comprobar Nome Completo"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Don"
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "fillo"
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Sri�a."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Sra."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sra."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como unha _T�boa"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduza o contrasinal %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Non fomos capaces de abrir este libro de enderezos. Isto\n"
-"significa que ou introduciches unha URI incorrecta, ou\n"
-"que se tentou acceder a un servidor LDAP e o programa\n"
-"non est� compilado con soporte LDAP. Se introduciches\n"
-"unha URI comproba que sexa correcta e volve introducila.\n"
-"Sen�n, probablemente tentaches acceder a un servidor\n"
-"LDAP. Se desexas poder usar LDAP, necesitar�s baixar e\n"
-"instalar OpenLDAP e recompilar e instalar Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555 widgets/misc/e-filter-bar.h:95
-msgid "Show All"
-msgstr "Ver Todos"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avanzado..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Calquera campo cont�n"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Nome cont�n"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Enderezo cont�n"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que amosar� o Navegador de Cartafoles"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Ficheiro"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo de libro de enderezos desco�ecido"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ning�n (modo an�nimo)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Tipo de autenticaci�n desco�ecido"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "�nico"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Sub�rbore"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Tipo de �mbito desco�ecido"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Asignar ND:"
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr "AM��AME Texto de axuda para Asignar ND aqu�"
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Lembrar este contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr "AM��AME Texto de axuda para Servidor aqu�"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Porto:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome de ficheiro:"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "AM��AME Texto de axuda para Porto aqu�"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "decembro"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "ND Ra�z:"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "AM��AME Texto de axuda para ND Ra�z aqu�"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Buscar �mbito:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Quitar"
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autenticaci�n:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Cami�o:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr "AM��AME Texto de axuda para Cami�o aqu�"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Crear cami�o se non existe."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Editar o Libro de Enderezos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Engadir Libro de Enderezos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Elixe a clase de Libro de Enderezos que tes, e introduce a informaci�n "
-"relevante sobre el."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr "AM��AME Texto de axuda para Nome aqu�"
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrici�n:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr "AM��AME Texto de axuda para Descrici�n aqu�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Engadir Fontes para o Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Eliminar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Editar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Desactivar Petici�ns"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Activar Petici�ns (�Perigoso!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Editar Informaci�n de Contacto"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Engadir a Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un control de Bonobo para un men� emerxente de enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control de Bonobo para amosar un enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Unha mostra de control de Bonobo que amosa un libro de enderezos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Compo�ente de Evolution para manexar contactos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "F�brica para o control da Minitarxeta do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "F�brica para o visor de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "F�brica para o men� emerxente do enderezo do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "F�brica para a mostra de control do Libro de Enderezos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Quitar"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Quitar Todos"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaz de selecci�n de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "F�brica para a interfaz de selecci�n de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Buscar..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatarios da mensaxe"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleccionar Nomes"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleccionar nome desde:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1187,156 +1317,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Enviar contacto a outro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:51 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Configuraci�n da Impresi�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fontes"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erro desco�ecido"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Traballar desconectado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Ficheiro non atopado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operaci�n non soportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erro de E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Erro lendo os datos:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Prema aqu� para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Correo Electr�nico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Tel�fono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Tel�fono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Tel�fono de Negocios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Tel�fono de Reincorporaci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Tel�fono da Compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Tel�fono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizaci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Tel�fono M�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Tel�fono Autom�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Tel�fono Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Outro Tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "T�tulo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesi�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Sobrenome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "C�nxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL libre-ocupada"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Feito"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Cargando axenda..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1379,7 +1607,8 @@ msgid "Dimensions:"
 msgstr "Dimensi�ns:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1439,7 +1668,6 @@ msgid "Margins"
 msgstr "Marxes"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "N�mero de columnas:"
 
@@ -1519,39 +1747,64 @@ msgstr "Tipo:"
 msgid "Width:"
 msgstr "Largura:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Fonte..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n pilot da Axenda"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n pilot ToDo (PorFacer)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Recordatorio da cita en "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Unha mostra de control Bonobo que mostra unha axenda."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Adiar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Compo�ente da axenda do resume executivo de Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Aceptar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+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
+msgid "Factory for the Calendar Summary component."
+msgstr "F�brica para o compo�ente Resume da Axenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "F�brica para o compo�ente da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "F�brica para o control vista iTip da axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "F�brica para a mostra de control Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "F�brica para o compo�ente da axenda de Evolution."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1561,140 +1814,258 @@ msgstr "Servicio de notificaci�n de alarma"
 msgid "Factory for the alarm notification service"
 msgstr "F�bica para o sercivio de notificaci�n de alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Amosar informaci�n sobre o Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+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.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Pechar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Non hai resume dispo�ible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Recordatorio da cita en "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Aceptar"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
-msgstr "Son (�) a(s) %s. O tempo Unix � agora %ld. Pensamos que che pode apetecer sabelo."
+msgstr ""
+"Son (�) a(s) %s. O tempo Unix � agora %ld. Pensamos que che pode apetecer "
+"sabelo."
 
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:109
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificacin de alarma"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Ficheiro non atopado"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Abrir axenda"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d de %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Gardar axenda"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B de %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Non foi posible crear o visor da axenda. Comproba a t�a configuraci�n de ORBit e OAF."
+msgstr ""
+"Non foi posible crear o visor da axenda. Comproba a t�a configuraci�n de "
+"ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desco�ecido"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completada"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelada"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1705,24 +2076,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
-"A clasificaci�n ten que ser 'P�blica', 'Privada', 'Confidencial' ou 'Ningunha'"
+"A clasificaci�n ten que ser 'P�blica', 'Privada', 'Confidencial' ou "
+"'Ningunha'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1732,116 +2108,292 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Recurrindo"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Vista de Tarxeta"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Citas"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana Lab_oral"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Definir Vistas"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tarefas"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mes"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erro cargando a axenda</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "O URI que amosar� a axenda"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro cargando a axenda:<br>M�todo non soportado"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmas Sonoras"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Visualizar"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinatarios da mensaxe"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Amosar citas..."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Opci�ns de Vista"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Amosar tarefas"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Cousas por facer"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Cargando Axenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "O URI que amosar� a axenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Almacenamento da mensaxe"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificaci�n da s�a cita o %A, %d de %b de %Y, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Non hai resume dispo�ible."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Pechar"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editar cita"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "d�as"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualizar cada"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d d�as"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " un d�a"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " unha semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " unha hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " un minuto"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " un segundo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Tocar un son"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Mostrar todas as cabeceiras da mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Enviar unha mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Executar un programa"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " antes do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " despois do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " antes da fin desta cita"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " despois da fin desta cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data e hora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Recordatorios"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resume:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opci�ns"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "despois"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "antes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "d�a(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "fin da cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "hora(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "comezo da cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1872,36 +2424,38 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "As alarmas saltan despois de"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmas Sonoras"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Chifrar cando aparece a fiestra de alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferencias da Axenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Cores"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Opci�ns do navegador de Citas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1909,593 +2463,1091 @@ msgid "Defaults"
 msgstr "Opci�ns por defecto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Opci�ns de Vista"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-#, fuzzy
-msgid "Due Date"
-msgstr "Cita Agardada"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#, fuzzy
-msgid "Enable snoozing for"
-msgstr "Activar adiando para"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Final do d�a:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primeiro d�a da semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Resaltar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#, fuzzy
-msgid "Items Due Today"
-msgstr "Cousas esperadas para hoxe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Items Due Today:"
-msgstr "Cousas esperadas para hoxe:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#, fuzzy
-msgid "Items Not Yet Due"
-msgstr "Cousas a�nda non esperadas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#, fuzzy
-msgid "Items Not Yet Due:"
-msgstr "Cousas a�nda non esperadas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Overdue Items"
-msgstr "Retrasar Cousas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
-msgid "Overdue Items:"
-msgstr "Retrasar Cousas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioridade"
+msgid "Overdue tasks"
+msgstr "Retrasar Cousas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Lembrarme todas as citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Amosar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Amosar os prazos finais das citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Amosar n�meros de semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inicio do d�a:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
-msgid "TaskPad"
-msgstr "Rota de Tarefas"
+msgid "Task List"
+msgstr "Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Cousas esperadas para hoxe"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Xoves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tempo ata que se deba facer"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "T�tulo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisi�ns da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Zona horaria: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmas Visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "M�r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "M�rcores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Semana de traballo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana Lab_oral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutos antes de que ocorran."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "segundos."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "�Est� seguro de que quere borrar esta conta?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "�Est� seguro de que quere borrar a tarefa `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "�Est� seguro de que quere borrar a entrada de diario `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Completada"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Completada"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Cita Agardada"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entrada de diario - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sen resume"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "�Sobrescribir ficheiro?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Xa existe un ficheiro con ese nome.\n"
+"�Sobrescribilo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "Save As..."
+msgstr "Gardar _Como..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 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:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, 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:91
+#: calendar/gui/dialogs/delete-comp.c:105
 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/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�Quere gardar os cambios?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "�Est� seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "�Est� seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Sen resume"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "�Est� seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Seleccionar un ficheiro"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Secci�ns:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada de diario - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zona horaria: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Cita"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Recurrencia"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Cancelar Reuni�n"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Evento de d�a comp_leto"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificaci�n"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data e hora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data Completada:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "En Progreso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "P�_blico"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data de _Inicio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "_Resume:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarefa"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contactos..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Hora de _finalizaci�n:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
 #, fuzzy
-msgid "_Due Date:"
-msgstr "_Data Estimada:"
+msgid "Group"
+msgstr "Nome do grupo:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioridade:"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Orixe do papel:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Estado:"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Categor�as"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Presidir"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Participante Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Non-Participante"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Engadir acci�n"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Aceptar "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Rexeitar "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Tel�fono Autom�bil"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Participante Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Non-Participante"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Enviada"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Eliminar..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Ocupada"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Data de _finalizaci�n:"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Eliminada"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Data de _Inicio:"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Eliminada"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Posici�n xeogr�fica"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Xestor"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Porcentaxe colpleta"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "decembro"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "_Resume"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Transparencia"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Posto"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 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 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Convidar Outros..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita cont�n recurrencias que Evolution non pode editar."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "o"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "d�a"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+#, fuzzy
+msgid "th"
+msgstr "4�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ocurrencias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Recurrencia personalizada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Excepci�ns"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sen recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regra de Recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Recurrencia simple"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "para"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "para sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "ata"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data Completada:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmas"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tarefa"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Prema aqu� para engadir unha tarefa"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+#, fuzzy
+msgid "_Due Date:"
+msgstr "_Data Estimada:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Estado:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marcar como Completa"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marcar a tarefa como completa"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "Editar esta tarefa..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Editar Tarefa"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcar como Completa"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Borrar esta tarefa"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcar como Completa"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Borrar a tarefa"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Prema aqu� para engadir unha tarefa"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categor�as"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Completo"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Data na que se completa"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Due Date"
+msgstr "Cita Agardada"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Data de _finalizaci�n:"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Posici�n xeogr�fica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "_Resume"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Novo Evento de d�a _completo"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Ir a Hoxe"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ir � Data"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "AM��AME: Programar Reuni�n"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Borrar todas as Ocurrencias"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Borrar Todas as Ocurrencias"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisi�ns de minuto"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "�Non foi posible actualizar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Este � o enderezo da lista de correo"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Compo�ente actualizada con �xito."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Houbo un erro cargando o ficheiro da axenda."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "�Non foi posible abir o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "�Non foi posible cargar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "�Non foi posible ler o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "�Esta � unha resposta de algu�n que non foi convidado!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "�Non foi posible actualizar o almacenamento da axenda!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "�Non se puido borrar o compo�ente da axenda!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Compo�ente borrado con �xito."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Non se reco�ece este tipo de compo�ente de axenda."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Engadir � Axenda"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Aceptar "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Rexeitar "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Tentativa "
+#: calendar/gui/e-itip-control.c:834
+#, 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:860
-msgid "Update Calendar"
-msgstr "Actualizar Axenda"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Cancelar Reuni�n"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "�Non foi posible actualizar o ficheiro da axenda!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "�Non foi posible abir o ficheiro da axenda!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2510,26 +3562,22 @@ msgstr "--a--"
 msgid "Calendar Message"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Cargando Axenda"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Cargando axenda..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaxe de servidor:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resume:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "data-finalizaci�n"
@@ -2538,423 +3586,48 @@ msgstr "data-finalizaci�n"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Ocupada"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Enderezo ocupado"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Ocupadas: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Cancelar\n"
-"Reuni�n"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Presidir"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Convida para a Reuni�n"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Non-Participante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Participante Opcional"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizador:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publicar\n"
-"Evento"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Solicitar\n"
-"Reuni�n"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Participantes Requiridos"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Posto"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Programar\n"
-"Hora"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
-msgid "Status"
-msgstr "Estado"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Todas"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categor�a:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, 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/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "o"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "d�a"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "no"
-
-#: calendar/gui/event-editor.c:613
-#, fuzzy
-msgid "th"
-msgstr "4�"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "ocurrencias"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita cont�n recurrencias que Evolution non pode editar."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d d�as"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " un d�a"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d semanas"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " unha semana"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d horas"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " unha hora"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutos"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " un minuto"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d segundos"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " un segundo"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Tocar un son"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Amosar un di�logo"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Enviar unha mensaxe"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Executar un programa"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " antes do comezo da cita"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " despois do comezo da cita"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " antes da fin desta cita"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " despois da fin desta cita"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Evento de d�a comp_leto"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "B�sicos sobre Citas"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excepci�ns"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sen recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regra de Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Preferencias..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _finalizaci�n:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora de _comezo:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data de _comezo:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "despois"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "antes"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "d�a(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "fin da cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "para"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "para sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "hora(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mes(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "comezo da cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "ata"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "semana(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "ano(s)"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Nova Cita..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Borrar Todas as Ocurrencias"
-
 #. 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Amosar todas "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "O resume cont�n"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "A descrici�n cont�n"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "O comentario cont�n"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Ten a categor�a"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nova Cita..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, 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_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Unha mostra de control Bonobo que mostra unha axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Compo�ente da axenda do resume executivo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-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
-msgid "Factory for the Calendar Summary component."
-msgstr "F�brica para o compo�ente Resume da Axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "F�brica para o compo�ente da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "F�brica para o control vista iTip da axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "F�brica para a mostra de control Axenda"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -2976,233 +3649,257 @@ msgid "Go To Date"
 msgstr "Ir � Data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir a hoxe"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "xaneiro"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "xullo"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "xu�o"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "novembro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "outubro"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir a hoxe"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tarefas"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto est� mal, o %a � o nome de semana
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1488
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Previsualizaci�n da Impresi�n"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimir este elemento"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Configuraci�n da Impresi�n"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
@@ -3210,7 +3907,9 @@ msgstr "O URI do cartafol de tarefas a amosar"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas automaticamente ao novo cartafol de tarefas."
+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
 msgid ""
@@ -3219,104 +3918,129 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution tentou coller as tarefas que estaban no cartafol da axenda e migralas automaticamente ao novo cartafol de tarefas.\n"
-"Non foi posible migrar algunhas das tarefas, as� que pode tentar facerse este proceso outra vez no futuro."
+"Evolution tentou coller as tarefas que estaban no cartafol da axenda e "
+"migralas automaticamente ao novo cartafol de tarefas.\n"
+"Non foi posible migrar algunhas das tarefas, as� que pode tentar facerse "
+"este proceso outra vez no futuro."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "Non se puido abrir `%s'; non se migrar�n obxectos do cartafol da axenda ao de tarefas."
+msgstr ""
+"Non se puido abrir `%s'; non se migrar�n obxectos do cartafol da axenda ao "
+"de tarefas."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr "Non est� soportado o m�todo requerido para cargar `%s'; non se migrar�n obxectos do cartafol da axenda ao de tarefas."
+msgstr ""
+"Non est� soportado o m�todo requerido 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
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Non est� soportado asinar por este cifrado"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Non est� soportado asinar en claro por este cifrado"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Non est� soportado verificar por este cifrado"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Non est� soportado encriptar por este cifrado"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Non est� soportado desencriptar por este cifrado"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr "Debe estar traballando conectado para completar esta operaci�n"
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:666
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Completo"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro analizando o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro executando o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro executando b�squeda por filtro: %s: %s"
@@ -3352,17 +4076,38 @@ msgstr "Efectuando petici�n sobre a cabeceira desco�ecida: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inv�lido nos contidos do corpo, agard�base unha cadea"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Non foi posible crear unha canalizaci�n: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Non foi posible facer fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, 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."
+msgstr ""
+"A operaci�n expirou tentando obter o ficheiro de bloqueo sobre %s. T�nteo de "
+"novo m�is tarde."
 
 #: camel/camel-lock.c:201
 #, c-format
@@ -3374,120 +4119,116 @@ msgstr "Fallo ao tentar obter bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo ao tentar obter bloqueo usando flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, 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:148
+#: camel/camel-movemail.c:122
 #, 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:158
+#: camel/camel-movemail.c:130
 #, 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:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro lendo o ficheiro de correo: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro escribindo o ficheiro temporal de correo: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Erro � almacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalizaci�n: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erro desco�ecido)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro lendo o ficheiro de correo: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro escribindo o ficheiro temporal de correo: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erro copiando o ficheiro temporal de correo: %s"
 
-#: camel/camel-pgp-context.c:190
-#, c-format, fuzzy
+#: camel/camel-pgp-context.c:193
+#, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Non hai texto plano para asinar."
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1067
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "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:685
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Non hai texto plano para asinar en claro."
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Non hai texto plano para verificar."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1050
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Non hai texto plano para encriptar."
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Non se especificaron destinatarios."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Non hai texto cifrado para desencriptar."
 
 #: camel/camel-provider.c:131
 #, 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."
+msgstr ""
+"Non foi posible cargar %s: Non se soporta a carga de m�dulos neste sistema."
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -3499,37 +4240,37 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai c�digo de inicializaci�n no m�dulo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "servicio %s para %s en %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Conexi�n Cancelada"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(m�quina desco�ecida)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor desconectou inesperadamente"
 
@@ -3546,7 +4287,7 @@ msgid "Authentication failed."
 msgstr "Fallo de autenticaci�n"
 
 #: camel/camel-sasl-anonymous.c:119
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -3555,7 +4296,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -3581,7 +4322,9 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Esta opci�n conectarase � servidor usando un contrasinal seguro CRAM-MD5, se o servidor o soporta."
+msgstr ""
+"Esta opci�n conectarase � servidor usando un contrasinal seguro CRAM-MD5, se "
+"o servidor o soporta."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3592,7 +4335,9 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Esta opci�n conectarase � servidor usando un contrasinal seguro DIGEST-MD5, se o servidor o soporta."
+msgstr ""
+"Esta opci�n conectarase � servidor usando un contrasinal seguro DIGEST-MD5, "
+"se o servidor o soporta."
 
 #: camel/camel-sasl-digest-md5.c:810
 #, fuzzy
@@ -3607,7 +4352,9 @@ msgstr "Resposta do servidor non v�lida\n"
 #: camel/camel-sasl-digest-md5.c:825
 #, fuzzy
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "A resposta do servidor conti�a o sinal \"Quality of Protection\" (\"Calidade de Protecci�n\") non v�lido\n"
+msgstr ""
+"A resposta do servidor conti�a o sinal \"Quality of Protection\" (\"Calidade "
+"de Protecci�n\") non v�lido\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -3640,7 +4387,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
@@ -3656,60 +4403,60 @@ msgstr "Esta opci�n conectarase � servidor usando un simple contrasinal."
 msgid "Unknown authentication state."
 msgstr "Estado de autenticaci�n desco�ecido."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilaci�n da espresi�n regular: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, 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:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co cami�o"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na b�squeda do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na b�squeda do servidor: %s: motivo desco�ecido"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo como petici�n de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, 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:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3718,33 +4465,53 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Lixo"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "O ficheiro non existe."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "O ficheiro non existe."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Fallo ao enviar o nome de usuario ao servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Fallo na mensaxe %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"Enderezo de Correo-E: %s\n"
-"Nome Com�n: %s\n"
-"Unidade en Organizaci�n: %s\n"
-"Organizaci�n: %s\n"
-"Localidade: %s\n"
-"Estado: %s\n"
-"Pa�s: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3759,17 +4526,36 @@ msgstr ""
 "\n"
 "�Desexa aceptar de todas maneiras?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"Enderezo de Correo-E: %s\n"
+"Nome Com�n: %s\n"
+"Unidade en Organizaci�n: %s\n"
+"Organizaci�n: %s\n"
+"Localidade: %s\n"
+"Estado: %s\n"
+"Pa�s: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar a URL `%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
@@ -3778,60 +4564,76 @@ msgstr "Non existe a mensaxe: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non podes copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Non foi posible abrir o directorio de cach�: %s"
-
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Erro desco�ecido"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de m�is."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, 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:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible cargar resume para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:349
-msgid "Scanning IMAP folder"
-msgstr "Explorando cartafol IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Gardando as mensaxes"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Gardando as mensaxes"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 #, fuzzy
 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-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Non foi posible abrir o directorio de cach�: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -3839,7 +4641,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:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -3850,7 +4652,8 @@ msgstr "Amosar namais cartafoles subscritos"
 #: camel/providers/imap/camel-imap-provider.c:52
 #, fuzzy
 msgid "Override server-supplied folder namespace"
-msgstr "Sobrescribir o nome do espacio de cartafoles proporcionado polo servidor"
+msgstr ""
+"Sobrescribir o nome do espacio de cartafoles proporcionado polo servidor"
 
 #: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
@@ -3874,28 +4677,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:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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 pedida."
 
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, 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:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3906,102 +4709,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr "O cartafol %s non � seleccionable"
-
-#: camel/providers/imap/camel-imap-store.c:882
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Non foi posible crear o directorio %s: %s"
+msgid "No such folder %s"
+msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "Debe estar traballando conectado para completar esta operaci�n"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Para almacenar correo local en directorios de correo tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Ficheiro mailbox est�ndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Para almacenar correo local en formato est�ndar mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Ficheiros de correo con formato maildir de Qmail"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Para almacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Ficheiros de correo con formato maildir de Qmail"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Para almacenar correo local en directorios maildir de qmail"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A ra�z de almacenamento %s non � un cami�o absoluto"
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O ra�z de almacenamento %s non � un directorio regular."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "Os almacenamentos locais non te�en un inbox"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, 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:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resume de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resume: motivo desco�ecido"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, 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:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4010,18 +4819,19 @@ msgstr ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contidos da mensaxe non v�lidos"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4031,14 +4841,14 @@ msgstr ""
 "Non � posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4048,22 +4858,29 @@ msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "non � un directorio maildir."
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Non foi posible crear o cartafol `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4071,11 +4888,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non � posible abrir a caixa de correo temporal: %s"
@@ -4085,9 +4904,12 @@ msgstr "Non � posible abrir a caixa de correo temporal: %s"
 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:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4096,11 +4918,13 @@ msgstr ""
 "Non � posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 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:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucci�n da mensaxe fallida: �mailbox corrompido?"
 
@@ -4145,81 +4969,100 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Resumindo cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Non foi posible abir o cartafol: %s: resumindo desde a posici�n %ld: %s"
+msgstr ""
+"Non foi posible abir o cartafol: %s: resumindo desde a posici�n %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Erro fatal do analizador de correo preto da posici�n %ld no cartafol %s"
+msgstr ""
+"Erro fatal do analizador de correo preto da posici�n %ld no cartafol %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: 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-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, 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:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resume e o cartafol non concordan, mesmo logo de sincronizar"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, 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:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, 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:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non � posible engadir a mensaxe � cartafol mh: %s: %s"
@@ -4234,40 +5077,94 @@ msgstr "`%s' non � un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir o cami�o do directorio MH: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' non � un ficheiro regular."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "O cartafol `%s' non existe."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Os almacenamentos locais non te�en un inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Ficheiro local de correo %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Non foi posible pechar o cartafol orixe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fallo ao enviar o nome de usuario ao servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 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:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format, fuzzy
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#, fuzzy, 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:153
-#, c-format, fuzzy
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
 
@@ -4279,25 +5176,25 @@ msgstr "Novas USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este � um provedor para ler e enviar aos grupos de novas de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 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:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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"
@@ -4313,7 +5210,8 @@ msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
-msgstr "Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
+msgstr ""
+"Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
 
 #: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
@@ -4348,7 +5246,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4385,27 +5283,27 @@ msgid ""
 msgstr ""
 "Isto conectarase � servidor POP e usar� Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, 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:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Non foi posible conectarse � servidor: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, 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:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, 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:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4414,12 +5312,12 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Desco�ecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4427,7 +5325,7 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non se soporta o mecanismo de autenticaci�n solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4436,13 +5334,13 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4497,131 +5395,136 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a trav�s do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para entregar correo por conexi�n a un servidor de correo remoto usando 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:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non reco�ecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos par�metros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Par�metro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 #, fuzzy
 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:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensaxe de Axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisi�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 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:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Acci�n de correo pedida exitosa, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non � local; re-enviarase a <cami�o-de-reenv�o>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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"
+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:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Acci�n pedida abortada: erro ao procesar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; t�ntao con <cami�o-de-reenv�o>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
-msgstr "A acci�n pedida non foi levada a cabo: insuficiente almacenamento no sistema"
+msgstr ""
+"A acci�n pedida non foi levada a cabo: insuficiente almacenamento no sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "A acci�n pedida foi abortada: excedeu a asignaci�n de almacenamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "A acci�n pedida non foi levada a cabo: nome de mailbox non permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comeza a entrada da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Fallo na transacci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Neces�tase un contrasinal para a transacci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaci�n � feble de m�is"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neces�tase encriptaci�n para o mecanismo de autenticaci�n pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticaci�n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticaci�n requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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 requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4632,317 +5535,235 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando a mensaxe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 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:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Erro creando o obxecto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autenticaci�n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "A petici�n AUTH expirou: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "O env�o de DATA expirou: rematando mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Erro na resposta DATA: rematando a mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, 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:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Inclu�r un ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Inclu�r un ficheiro como anexo na mensaxe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
-msgid "Attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propiedades do anexo"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "Anexo Inline"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:699
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: composer/e-msg-composer.c:710
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erro gardando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:730
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erro cargando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:802
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"�Gustar�alle usar o cartafol de borradores por defecto?"
-
-#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:866
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta mensaxe non foi enviada.\n"
-"\n"
-"�Desexa gardar os cambios?"
-
-#: composer/e-msg-composer.c:891
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1017
-msgid "That file does not exist."
-msgstr "O ficheiro non existe."
-
-#: composer/e-msg-composer.c:1027
-msgid "That is not a regular file."
-msgstr "Non � un ficheiro normal."
-
-#: composer/e-msg-composer.c:1037
-msgid "That file exists but is not readable."
-msgstr "O ficheiro existe pero non se pode ler."
-
-#: composer/e-msg-composer.c:1047
-msgid "That file appeared accesible but open(2) failed."
-msgstr "O ficheiro parec�a accesible pero a chamada a open(2) fallou."
-
-#: composer/e-msg-composer.c:1069
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"O ficheiro � moi longo (m�is de 100K).\n"
-"�Est� seguro de querer inserilo?"
-
-#: composer/e-msg-composer.c:1090
-msgid "An error occurred while reading the file."
-msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
-msgid "Compose a message"
-msgstr "Compo�er unha mensaxe"
-
-#: composer/e-msg-composer.c:1825
-#, fuzzy
-msgid "Could not create composer window."
-msgstr "Non foi posible crear a fiestra do compositor"
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 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:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4950,7 +5771,138 @@ msgstr ""
 "Introduza os enderezos que recibir�n unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Inclu�r un ficheiro"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Gardar como..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Advertencia"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Incapaz de abrir o cartafol de borradores para esta conta.\n"
+"�Gustar�alle usar o cartafol de borradores por defecto?"
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro de sa�da: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro de sa�da: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erro gardando mensaxes en: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Pine.\n"
+"�G�star�alle importalos a Evolution?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"�Desexa gardar os cambios?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Inserir ficheiro de texto..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Compo�er unha mensaxe"
+
+#: composer/e-msg-composer.c:2351
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: composer/evolution-composer.c:359
 #, fuzzy
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4959,7 +5911,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade na compo�ente de correo."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
@@ -4978,36 +5930,58 @@ msgid "calendar information"
 msgstr "informaci�n de axenda"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, 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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5015,270 +5989,67 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Non se pode inicializar o compo�ente de Resume Executivo de Evolution."
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Erro lendo os datos:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-#, fuzzy
-msgid "File does not have a place for the services.\n"
-msgstr "O ficheiro non ten lugar para os servicios."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Pode seleccionar unha p�xina HTML diferente para o fondo do Resume Executivo.\n"
-"\n"
-"D�ixeo en branco para que apareza a asignada por defecto"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s coa aplicaci�n por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s co navegador web por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar unha mensaxe de correo a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Trocar a vista de %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Pechar %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s para a dereita"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s � fileira anterior"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mover %s � seguinte fileira"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aparencia"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fondo:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O compo�ente Resume Executivo non puido inicializar Bonobo.\n"
-"Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
-"significa que compilou Bonobo contra GOAD no canto de OAF."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Compo�ente de Evolution para o resume Executivo"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "F�brica para o resume RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Resume RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "F�brica para o compo�ente bonobo de probas."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "F�brica para o compo�ente de probas."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Comprobar servicio bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Comprobar servicio"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Erro"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Actualizar automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Actualizar agora"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Actualizar cada"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "d�as"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Escolleu unha data non v�lida."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5288,7 +6059,7 @@ msgstr ""
 "que sexa cando se executa o filtro ou se\n"
 "abre o cartafolv."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5296,7 +6067,7 @@ msgstr ""
 "A data da mensaxe ser� comparada co momento\n"
 "que especifique aqu�."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5307,28 +6078,36 @@ msgstr ""
 "\"hai unha semana\" por exemplo."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "unha hora relativa � hora actual"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<prema aqu� para seleccionar unha data>"
 
@@ -5353,8 +6132,8 @@ msgstr ""
 "Oops, esqueceu escoller un cartafol.\n"
 "Volva atr�s e especifique un cartafol v�lido no que deixar o correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -5366,46 +6145,6 @@ msgstr "Introduza o URI do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aqu� para seleccionar un cartafol>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar Filtros"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Editar CartafolesV"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Entrante"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Sa�nte"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Cartafoles Virtuais"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "cartafoles espec�ficos namais"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Fontes de CartafolV"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "con todos os cartafoles remotos activos"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "con todos os cartafoles locais e cos remotos activos"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "con todos os cartafoles locais"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5415,7 +6154,7 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Proba"
 
@@ -5427,36 +6166,88 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sen_t�tulo"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "sa�nte"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Engadir"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Editar CartafolesV"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Entrante"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Sa�nte"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Cartafoles Virtuais"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "cartafoles espec�ficos namais"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Fontes de CartafolV"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "con todos os cartafoles locais e cos remotos activos"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "con todos os cartafoles locais"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Asignar Cor"
 
 #: filter/libfilter-i18n.h:4
@@ -5532,90 +6323,91 @@ msgid "Expression"
 msgstr "Expresi�n"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Reenviar � Enderezo"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "A mensaxe foi recibida"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "A mensaxe foi enviada"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover � cartafol"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "en ou despois"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "en ou antes"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Coincide expresi�n regular (regexp)"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Establecer Estado"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tama�o"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "sona como"
@@ -5636,7 +6428,8 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
@@ -5656,7 +6449,7 @@ msgstr "Regras"
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:298
+#: filter/rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -5664,192 +6457,278 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuaci�n"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importar"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Correo Electr�nico"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Elm.\n"
+"�Gustar�alle importalas a Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Correo de Elm"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Engadir Libro de Enderezos"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Netscape.\n"
+"�G�star�alle importalos a Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Preferencias..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Netscape.\n"
+"�G�star�alle importalos a Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Pine.\n"
+"�G�star�alle importalos a Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Correo de Pine"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Compo�ente de evolution para manexar o correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Compo�ente de correo de resume executivo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Compo�ente de mostra de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Compo�ente de f�brica de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "F�brica para o compositor de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "F�brica para o compo�ente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "F�brica para a compo�ente Resume de Correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configuraci�n do Correo"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propiedades..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modificar as propiedades do ficheiro"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 #, fuzzy
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
 
-#: mail/folder-browser.c:253
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades para \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Almacenar b�squeda como CartafolV"
 
-#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:86
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "CartafolV sobre o A_sunto"
 
-#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:84
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "CartafolV sobre o Au_tor"
 
-#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:85
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "CartafolV sobre os _Destinatarios"
 
-#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:83
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV sobre _Lista de Correo"
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtro sobre o As_unto"
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtro sobre o Au_tor"
 
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtro sobre os D_estinatarios"
 
-#: mail/folder-browser.c:585
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtro sobre a Lista de _Correo"
 
-#: mail/folder-browser.c:594
-msgid "_Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:108 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Responder a _Todos"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:97
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:611
-#, fuzzy
-msgid "Forward _inline"
-msgstr "Re-enviar inline"
-
-#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:42
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como _non Lida"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Mover � cartafol.."
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Copiar � cartafol..."
 
-#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:113
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Engadir Libro de Enderezos"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:641
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Desde Mensaxe"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtro sobre a Lista de Correo"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para \"%s\""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Compo�ente de evolution para manexar o correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Compo�ente de correo de resume executivo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Compo�ente de mostra de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Compo�ente de f�brica de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "F�brica para o compositor de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "F�brica para o compo�ente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "F�brica para a compo�ente Resume de Correo."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Elm.\n"
-"�Gustar�alle importalas a Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Correo de Elm"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -5867,26 +6746,6 @@ msgstr "F�brica para importar correo de Outlook Express 4 a Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa ficheiros de Outlook Express a Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Netscape.\n"
-"�G�star�alle importalos a Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Pine.\n"
-"�G�star�alle importalos a Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Correo de Pine"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato de almacenamento actual:"
@@ -5922,37 +6781,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "Non enchiches toda a informaci�n requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de Contas de Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"�Desexa gardar os cambios?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Desactivado"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Recuperar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Facer esta a mi�a conta por defecto"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Xestor de Contas de Evolution"
 
@@ -5980,7 +6871,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5992,7 +6883,7 @@ msgstr ""
 "recibir ou compo�er correo.\n"
 "�Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6000,7 +6891,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -6009,11 +6900,11 @@ msgstr ""
 "Necesitas configurar transporte para o correo\n"
 "antes de poder compo�elo."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ning�n m�todo de env�o de correo"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6021,37 +6912,45 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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:353
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Ten que configurar unha identidade antes de poder enviar este correo."
 
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "O %s, %s escribiu:"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada:\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1155
+#: mail/mail-callbacks.c:1374
 #, 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:1169
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6059,7 +6958,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borrador."
 
-#: mail/mail-callbacks.c:1201
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6067,27 +6966,25 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "no cartafol de Enviados."
 
-#: mail/mail-callbacks.c:1234 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "�Sobrescribir ficheiro?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "�Est� seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1238 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Xa existe un ficheiro con ese nome.\n"
-"�Sobrescribilo?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "A mensaxe foi recibida"
 
-#: mail/mail-callbacks.c:1282
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1284
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1399
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6096,43 +6993,54 @@ msgstr ""
 "Erro cargando a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1448 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtros..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1495
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:1573
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "�Est� seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
-
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
+msgstr ""
+"�Est� seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr "Introduza nome e enderezo de correo electr�nico m�is abaixo. Os campos \"opcionais\" non necesitan encherse, a non ser que desexe inclu�r esta informaci�n nas mensaxes que mande."
+msgstr ""
+"Introduza nome e enderezo de correo electr�nico m�is abaixo. Os campos "
+"\"opcionais\" non necesitan encherse, a non ser que desexe inclu�r esta "
+"informaci�n nas mensaxes que mande."
 
 #: mail/mail-config-druid.c:101
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
-msgstr "Introduza informaci�n sobre o servidor de correo entrante. Se non sabe qu� clase de servidor usa, contacte co administrador do sistema ou co Provedor de Servicios de Internet."
+msgstr ""
+"Introduza informaci�n sobre o servidor de correo entrante. Se non sabe qu� "
+"clase de servidor usa, contacte co administrador do sistema ou co Provedor "
+"de Servicios de Internet."
 
 #: mail/mail-config-druid.c:105
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
-msgstr "Introduza informaci�n sobre o protocolo do servidor de correo sa�nte. Se non sabe o protocolo que usa, contacte co administrador do sistema ou co Provedor de Servicios de Internet."
+msgstr ""
+"Introduza informaci�n sobre o protocolo do servidor de correo sa�nte. Se non "
+"sabe o protocolo que usa, contacte co administrador do sistema ou co "
+"Provedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:107
 msgid ""
@@ -6141,13 +7049,22 @@ msgid ""
 "will be grouped together to make an Evolution mail account. Please enter a "
 "name for this account in the space below. This name will be used for display "
 "purposes only."
-msgstr "Case rematou co proceso de configuraci�n do correo. A identidade, servidor de correo entrante e m�todo de transporte de correo sa�nte que introduciu ser�n agrupados para facer unha conta de correo de Evolution. Introduza un nome para esta conta no espacio de abaixo. Este nome s� se usar� co prop�sito de mostralo."
+msgstr ""
+"Case rematou co proceso de configuraci�n do correo. A identidade, servidor "
+"de correo entrante e m�todo de transporte de correo sa�nte que introduciu "
+"ser�n agrupados para facer unha conta de correo de Evolution. Introduza un "
+"nome para esta conta no espacio de abaixo. Este nome s� se usar� co "
+"prop�sito de mostralo."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Asistente de Contas de Evolution"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Detectar tipos soportados "
@@ -6157,34 +7074,64 @@ msgid " color"
 msgstr " cor"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Non est� soportado asinar por este cifrado"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Xesti�n e Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Comprobar automaticamente se hai correo novo de cada"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redactar"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6200,165 +7147,281 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Cartafol Borradores:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Enderezo de Correo-E:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Activado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:43
 #, fuzzy
-msgid "Highlight citations with "
+msgid "Highlight citations with"
 msgstr "Resaltar citas con "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "�_ndice"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Facer esta a mi�a conta por defecto"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensaxes como \"Lidas\" despois de: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizaci�n:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Cami�o do binario PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Escoller unha cor"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "No_tas:"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Recibindo Opci�ns"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Informaci�n Requerida"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Seguridade"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Seleccionar o binario PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar mensaxes en formato HTML por defecto."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "O servidor require autenticaci�n"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Sen Informaci�n"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Usar conexi�n segura (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6368,163 +7431,243 @@ msgstr ""
 "\n"
 "Preme en \"Seguinte\" para empezar. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segundos."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Non foi posible conectarse � servidor POP en %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Non foi posible conectarse � servidor POP en %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Non foi posible crear o directorio %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Non foi posible crear a fiestra do compositor"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Gardar � Disco..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualizador Externo"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:357
-#, c-format, fuzzy
+#: mail/mail-display.c:399
+#, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (v�a %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizador Externo"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Cargado o contido da mensaxe"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Abrir ligaz�n no navegador"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Copiar localizaci�n (AM��AME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Gardar como (AM��AME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Copiar localizaci�n (AM��AME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gardar como..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d segundos"
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Cargado o contido da mensaxe"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Enderezo de Correo-E:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder-A:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Para"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
 
-#: mail/mail-format.c:1065
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non est� configurado."
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:1086
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1087
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Preme na icona para desencriptar."
 
-#: mail/mail-format.c:1177 mail/mail-format.c:1565
+#: mail/mail-format.c:1377
 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:1185 mail/mail-format.c:1573
+#: mail/mail-format.c:1388
 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"
+msgstr ""
+"Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
+"autenticidade"
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:1798
+#: mail/mail-format.c:2060
 #, 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:1802
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:1836
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Punteiro a sitio FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1841
+#: mail/mail-format.c:2107
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Parte externa do corpo mal formada."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Non existe o cartafol %s"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abrindo '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar o cartafol \"%s\" � formato \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando o cartafol"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Pechando o cartafol actual"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Renomeando o cartafol antigo e abrindo"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creando un novo cartafol"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copiando as mensaxes"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6533,7 +7676,7 @@ msgstr ""
 "Non foi posible gardar metainformaci�n do cartafol, seguramente\n"
 "non poder� abrir este cartafol nunca m�is: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6541,7 +7684,17 @@ msgstr ""
 "Se non pode abrir m�is esta caixa de correo, poida\n"
 "que te�a que reparala a man."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Non podes copiar mensaxes deste cartafol de lixo."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurar %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6550,7 +7703,7 @@ msgstr ""
 "Erro mentres '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6559,105 +7712,105 @@ msgstr ""
 "Erro efectuando a operaci�n:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "�Acepta?"
-
-#: mail/mail-mt.c:874
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Enviando a mensaxe"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1152
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Lixo"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurando o cartafol"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1563
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recibindo as mensaxes"
 
-#: mail/mail-ops.c:1573
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe n�mero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1647
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Gardando as mensaxes"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6666,12 +7819,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1739
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6680,11 +7828,11 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6693,232 +7841,200 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Buscar"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sen_t�tulo)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "M�ltiples Mensaxes"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Editar Mensaxe"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Editar Mensaxe"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Re-enviar"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Buscar"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Cami�o:"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Cancelando ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Agardando ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Enviando"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "�Mensaxe incompleta escrita na canalizaci�n!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Resume de Correo"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaxe reenviada)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sen asunto)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Mensaxe reenviada (sen asunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
-"%s<br><b>Asunto:</b> %s <br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Novo CArtafolV"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:60
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:66
-msgid "Reply to the sender of this message"
-msgstr "Responder � autor desta mensaxe"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Responder a Todos"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:64
-msgid "Reply to all recipients of this message"
-msgstr "Responder a t�dolos destinatarios desta mensaxe"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Re-enviar"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Re-enviar esta mensaxe"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:57
-msgid "Print the selected message"
-msgstr "Imprimir a mensaxe seleccionada"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Borrar esta mensaxe"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Anterior"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Mensaxe Previa"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seguinte"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Seguinte Mensaxe"
-
-#: mail/message-list.c:678
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "M�ltiples Mensaxes"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "A m�is baixa"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "A m�is alta"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Hoxe �s %k:%M"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Onte �s %k:%M"
 
-#: mail/message-list.c:970
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Gardando as mensaxes"
+
+#: mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.c:1083
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1083
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:1084
-msgid "To"
-msgstr "Para"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Tama�o"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartafol"
 
@@ -6946,15 +8062,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Xestionar Subscripci�ns"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Compo�ente de Evolution para o resume Executivo"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Non se pode inicializar o compo�ente de Resume Executivo de Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Citas"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Amosar citas..."
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Resume de Correo"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Instalaci�n de Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Houbo un erro cargando o ficheiro da axenda."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erro cargando a axenda</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Secci�ns:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "A impresi�n da mensaxe fallou"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Limpar"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Desactivado"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_tas:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Existe"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mes"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "A m�is baixa"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Proba"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "A m�is baixa"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Amosar"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "A descrici�n cont�n"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Buscar de Novo"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "agora"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualizar agora"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "A descrici�n cont�n"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Correo Electr�nico"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Correo electr�nico principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Recibindo Correo"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Estado de autenticaci�n desco�ecido."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erro desco�ecido"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Convida para a Reuni�n"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Sri�a."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Vertical"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Lista de Correo"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Pechar esta fiestra"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Puntuaci�n"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Amosar tarefas"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Pechar esta fiestra"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cabeceira"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "d�as"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Cousas por facer"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Cousas por facer"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Respondida"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Cartafoles"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Todas Atendidas"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Mostar cartafoles que comezan por:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Opci�ns de Vista"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Visualizar"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Venres"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "M�rcores"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " unha semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Programar\n"
+"Hora"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tarefas"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Limpar a selecci�n"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "A shell de Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalles"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Cancelar Reuni�n"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Cartafoles especiais"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6962,29 +9519,25 @@ msgstr ""
 "Esta nova versi�n do Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal do Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 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:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con �xito."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Semella que � a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6995,16 +9548,14 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Non se poden copiar os ficheiros a\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7015,7 +9566,16 @@ msgstr ""
 "M�vao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7026,21 +9586,58 @@ msgstr ""
 "directorio de Evolution. M�vao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell.c:379
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Non � posible obter o cartafol: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Non se poden copiar os ficheiros a\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Non se pode activar o almacenamento local -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
 
-#: shell/e-shell.c:1249
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copiar � cartafol"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
-"Isto significa probablemente que o compo�ente %s se estragou."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mover � cartafol"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Borrar despois de %s d�a(s)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "�Est� seguro de que quere borrar a tarefa `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrindo cartafol %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7049,15 +9646,15 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "O nome de cartafol indicado non � v�lido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7065,41 +9662,133 @@ msgstr ""
 "O tipo do cartafol seleccionado non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sen_t�tulo)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Ning�n cartafol visualizado)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Escolla o ficheiro que quere importar a Evolution, e seleccione qu� tipo de "
+"ficheiro � na lista.\n"
+"\n"
+"Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� facer o "
+"traballo por vostede."
 
-#: shell/e-shell-view.c:1184
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importando %s\n"
+"Importador non preparado.\n"
+"Agarda 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importando %s\n"
+"Importando obxecto %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Non hai importador capaz de manexar\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importando"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importando %s.\n"
+"Comezando %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Erro iniciando %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Erro cargando %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importando %s\n"
+"Importando obxecto 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Autom�tico"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nome do ficheiro:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tipo do ficheiro:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Seleccionar cartafol"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 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:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7109,23 +9798,88 @@ msgstr ""
 "en grupo para xesti�n de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Erro gardando atallos."
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crear un novo grupo de atallos"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Traballar desconectado"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "Traballar desconectado"
+
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Ning�n cartafol visualizado)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Non se pode activar o almacenamento local -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
+"Isto significa probablemente que o compo�ente %s se estragou."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7134,119 +9888,202 @@ msgstr ""
 "�Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Eliminar este Grupo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Abrir nunha Nova Fiestra"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activar este atallo"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Erro gardando atallos."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Barra de _Atallos"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste almacenamento"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vista"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Ver o cartafol seleccionado"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_leta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Calquera campo cont�n"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Servidor:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7260,105 +10097,6 @@ msgstr "Tipo do cartafol:"
 msgid "Specify where to create the folder:"
 msgstr "Especifica �nde crear o cartafol:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "A shell de Evolution."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Escolla o ficheiro que quere importar a Evolution, e seleccione qu� tipo de ficheiro � na lista.\n"
-"\n"
-"Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� facer o traballo por vostede."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importando %s\n"
-"Importador non preparado.\n"
-"Agarda 5 segundos antes de tentalo de novo."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importando %s\n"
-"Importando obxecto %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Non hai importador capaz de manexar\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importando"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importando %s.\n"
-"Comezando %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Erro iniciando %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Erro cargando %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importando %s\n"
-"Importando obxecto 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Autom�tico"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nome do ficheiro:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Seleccionar un ficheiro"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tipo do ficheiro:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Preme en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -7381,26 +10119,36 @@ msgstr ""
 "Este asistente guiar�o no proceso de importar ficheiros\n"
 "externos a Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importar"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Non eliminar"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:83
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7422,7 +10170,7 @@ msgstr ""
 "Agardamos que desfrutes os resultados do noso duro traballo, �e\n"
 " estamos impacientes esperando a t�a contribuci�n!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7430,237 +10178,323 @@ msgstr ""
 "Graci�as\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:186
+#: shell/main.c:216
 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:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copiar a selecci�n"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Buscar"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Cortar a selecci�n"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Novo contacto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
-msgid "Previews the message to be printed"
-msgstr "Previsualiza a mensaxe que se vai imprimir"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Novas"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Previsualiza a axenda que se vai imprimir"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Seleccionar Todo"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Ver Todos"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Ver t�dolos contactos"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contacto"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Seleccionar Todo"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 D�as"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Preferencias alternativas"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crear un novo Evento de todo o d�a"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear unha nova cita"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crear unha nova axenda"
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "D�a"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Ir para atr�s no tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ir � _Data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Ir a _Hoxe"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir � hora actual"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Novo _Evento"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Abrir Axenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Ant"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nova Cita"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Imprimir Axenda"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimir esta Axenda"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gardar Como"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Informaci�n Requerida"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Gardar axenda como outra cousa distinta"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Amosar un d�a"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Hoxe"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Semana Lab_oral"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Citas"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_D�a"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Novo"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Abrir axenda"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Semana"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Pechar"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Pechar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra de Ferramentas Principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Previsualizar a Impresi�n"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configuraci�n da Impresi�n"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimir este elemento"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Gardar e Pechar"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Gardar a cita e pechar a caixa de di�logo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Trocar a vista de %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opci�ns de p�xina para a impresora actual"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Acci�ns"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Ficheiro"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Eliminar..."
 
@@ -7673,27 +10507,12 @@ msgstr "Axuda"
 msgid "Print En_velope..."
 msgstr "_Configuraci�n da Impresi�n..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprimir este elemento"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Gardar e Pechar"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de di�logo"
@@ -7710,877 +10529,1004 @@ msgstr "Ver a axuda online"
 msgid "Send _message to contact..."
 msgstr "Enviar unha _mensaxe ao contacto..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Acerca desta aplicaci�n"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Acerca de..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Acci�_ns"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Libro de enderezos... (AM��AME)"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Limpar"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Gardar a tarefa e pechar a caixa de di�logo"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Co_rtar"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar contacto a outro..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Comproba_r Nomes (AM��AME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar unha _mensaxe ao contacto..."
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Limpar"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Cancelar Reuni�n"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Limpar a selecci�n"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Re-enviar como _AxendaV (AM��AME)"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_iar ao Cartafol... (AM��AME)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Re-enviar esta mensaxe"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copiar"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copiar a selecci�n"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Solicitar\n"
+"Reuni�n"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Cortar"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Programar Reuni�n"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Cortar a selecci�n"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "AM��AME: Programar Reuni�n"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Acci�ns"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Envorcar XML"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Envorcar a descrici�n Xml da Interface"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancelada"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimeiro Obxecto no Cartafol (AM��AME)"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Gardar o ficheiro actual"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Re-en_viar (AM��AME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Redactar"
 
-#: ui/evolution-event-editor.xml.h:23
+#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Re-enviar como _AxendaV (AM��AME)"
+msgid "Compose _New Message"
+msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Ir � elemento seguinte"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Ir � elemento anterior"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Tarefa In_completa (AM��AME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modificar as propiedades do ficheiro"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Baleirar _Lixo"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Se_guinte"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Pegar"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Pegar o contido do cartafol"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Xestionar _Subcripci�ns"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "An_terior"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Previsualizar a Impresi�n"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "_Configuraci�n da Impresi�n..."
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Configuraci�n da Impresi�n"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Gardar"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de di�logo"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Gardar o ficheiro actual"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor de Cartafoles Virtuais..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Programar Reuni�n"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtros..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Programar algunha clase de reuni�n"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Enviar _Mensaxe"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleccionar Todo"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleccionar todo"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Previsualizar"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar as opci�ns de p�xina para a impresora actual"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_Petici�n de Tarefa (AM��AME)"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Acerca de..."
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Pechar"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AM��AME)"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Agochar Mensaxes S_eleccionadas"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copiar"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Agochar Mensaxes _Borradas"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Depuraci�n"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "A_xuda"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Obxecto (AM��AME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Marcar Todas como L_idas"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Entrada de diario (AM��AME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Derradeiro elemento no cartafol (AM��AME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Enviar Menxaxe (AM��AME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mover ao Cartafol ... (AM��AME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleccionar _Todo"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Nota (AM��AME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Seleccionar _F�o"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Pegar"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleccionar Todo"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AM��AME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Amosar _Todo"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Obxecto non Lido (AM��AME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Engadir Servicio"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Engadir un novo servicio ao Resume Executivo"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crear unha nova mensaxe de correo"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Lista de mensaxes por f�os"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Preferencias do Resume Executivo..."
+#: ui/evolution-mail-list.xml.h:25
+#, fuzzy
+msgid "_Expunge"
+msgstr "_Limpar"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova Mensaxe"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Cartafol"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter Selecci�n"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Cambiar as propiedades deste cartafol"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propiedades..."
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Redactar"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Lista de mensaxes por f�os"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Redactar unha nova mensaxe"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "_Configurar cartafol..."
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responder a t�dolos destinatarios desta mensaxe"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copiar a mensaxe a un novo cartafol"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder � autor desta mensaxe"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear Cartafol _Virtual Desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Eliminar as mensaxes seleccionadas"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Mostrar todas as cabeceiras da mensaxe"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Editar Mensaxe"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder � autor desta mensaxe"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "Editar a mensaxe actual"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Baleirar _Lixo"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Eliminar as mensaxes seleccionadas"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Expunge"
-msgstr "Limpar"
+msgid "Display the previous message"
+msgstr "Mensaxe Previa"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtro sobre _Lista de Correo"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtro sobre _Autor"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtro sobre _Destinatarios"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtro sobre o _Asunto"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borralas"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Esquecer _Contrasinais"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Re-enviar"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Re-enviar Como"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward inline"
-msgstr "Re-enviar inline"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Reenviar o correo seleccionado a algu�n"
+msgid "Forward _Attached"
+msgstr "Re-enviar Como"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Reenviar esta mensaxe in-line coa t�a, as� podes editala"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Cabeceiras Completas"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Hide Deleted Messages"
-msgstr "Agochar Mensaxes Borradas"
+msgid "Forward _Inline"
+msgstr "Re-enviar inline"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Hide S_elected Messages"
-msgstr "Agochar Mensaxes S_eleccionadas"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Re-enviar inline"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Deleted Messages"
-msgstr "Agochar Mensaxes _Borradas"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenviar o correo seleccionado a algu�n"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide _Read messages"
-msgstr "Agochar Mensaxes _Lidas"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenviar o correo seleccionado a algu�n"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Invert Selection"
-msgstr "Inverter Selecci�n"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Reenviar o correo seleccionado a algu�n"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _Subcripci�ns"
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenviar o correo seleccionado a algu�n"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark All as R_ead"
-msgstr "Marcar Todas como L_idas"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As Read"
-msgstr "Marcar como Lida"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Importante"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Marcar como _non Lida"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "Mover mensaxe a un novo cartafol"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr "Abrir nunha Nova Fiestra"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Seguinte"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleccionar _F�o"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print Preview of message..."
-msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "Imprimir mensaxe na impresora"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Print message..."
-msgstr "Imprimir mensaxe..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redireccionar (AM��AME: implem�ntame)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Reply to all"
-msgstr "Responder a Todos"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:65
-msgid "Reply to sender"
-msgstr "Responder � autor"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "F_ontes"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Imprimir mensaxe..."
 
-#: ui/evolution-mail.xml.h:68
-msgid "Save the message into a new file"
-msgstr "Gardar a mensaxe nun novo ficheiro"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Previsualizaci�n da Impresi�n"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleccionar _Todo"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "Seleccionar _F�o"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Responder a Todos"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Enviar unha resposta � persoa que che enviou esta"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "Mensaxe de servidor:"
 
-#: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Enviar unha �nica mensaxe en resposta a todo o correo seleccionado"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Gardar a mensaxe nun novo ficheiro"
 
-#: ui/evolution-mail.xml.h:75
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "_Cabeceiras Completas"
 
-#: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "Lista de mensaxes por f�os"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "A data ten que ser introducida no formato: %s"
+
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Inclu�r un ficheiro como anexo na mensaxe"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Recuperar"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "CartafolV sobre _Lista de Correo"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "View Raw Message Source"
-msgstr "Ver a Mensaxe en Fontes Cr�as"
+msgid "VFolder on Se_nder..."
+msgstr "CartafolV sobre o Au_tor"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor de Cartafoles Virtuais..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "CartafolV sobre os _Destinatarios"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "CartafolV sobre o A_sunto"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Anexo"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copiar � cartafol"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Limpar"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Filters..."
-msgstr "_Filtros..."
-
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Cartafol"
+msgid "_Forward Message"
+msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "�_ndice"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter Selecci�n"
+msgid "_Message Display"
+msgstr "Mensaxes"
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Mail Message"
-msgstr "Enviar _Mensaxe"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Mover � cartafol"
 
-#: ui/evolution-mail.xml.h:101
-msgid "_Mail Settings..."
-msgstr "_Preferencias de Correo..."
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Visualizar"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "Abrir Obxectos Seleccionados"
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Quoted"
-msgstr "No_tas:"
+msgid "_Re-send Message"
+msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "_Responder"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Resend Messages"
-msgstr "_Re-enviar Mensaxes"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zar Barras de Tarefas..."
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Save Message As..."
-msgstr "_Gardar Mensaxe Como..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizar"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizar barras de tarefas"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Pechar"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "_Por f�os"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vista"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Borrar todas as Ocurrencias"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar esta mensaxe con PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserir ficheiro de texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserir un ficheiro como texto dentro da mensaxe"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Asinar con PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gardar _Borrador"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Encriptar con PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Gardar no _cartafol... (AM��AME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Gardar"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gardar Como"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Gardar _Borrador"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Gardar no cartafol..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Gardar o ficheiro actual"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Gardar a mensaxe nun cartafol espec�fico"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar m�is _Tarde"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar m�is _tarde"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar a mensaxe en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar a mensaxe m�is tarde"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar a mensaxe agora"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar esta mensaxe agora"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Amosar / agochar anexos"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Amosar _anexos"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Amosar anexos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa s�a clave PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Asinar esta mensaxe coa s�a clave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Trocar mostra do campo BCC"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Trocar mostra do campo CC"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Trocar mostra do selector de Deste"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Trocar mostra do campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Anexo"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Depuraci�n"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Borrar"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir ficheiro de texto... (AM��AME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Seguridade"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "A_xuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Engadir o cartafol � lista de cartafoles subscritos"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Cartafol"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Eliminar o cartafol da lista de cartafoles subscritos"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Desubscribir"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Asig_nar Tarefa (AM��AME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Buscar de Novo"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "_Solicitude de Reuni�n (AM��AME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Refacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Refacer a acci�n desfeita"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Substitu�r"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Substitu�r unha cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Responder a _Todos (AM��AME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "_Mandar Informe de Estado (AM��AME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "S_altarse a Ocurrencia (AM��AME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Gardar a tarefa e pechar a caixa de di�logo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Buscar novamente a mesma cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Buscar unha cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Desfacer"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nova Tarefa"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Desfacer a �ltima acci�n"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Borrar a tarefa"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AM��AME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Actualizar Lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcar como Completa (AM��AME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Resposta (AM��AME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Abrir Obxectos Seleccionados"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Borrar a tarefa"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Borrar a tarefa"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Gardar como outra cousa distinta"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferencias das Tarefas..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Tarefa"
 
@@ -8588,132 +11534,220 @@ msgstr "_Tarefa"
 msgid "About Evolution..."
 msgstr "Acerca do Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar Barras de Tarefas..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Cambiar as propiedades deste cartafol"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de tarefas"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copiar � cartafol"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creando un novo cartafol"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Eliminar este atallo da barra de atallos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creando un novo cartafol"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Borrar este elemento"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visualizar un cartafol diferente"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Sa�r"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Fiestra do Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "_Atallo da barra do Evolution"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Sa�r do programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Iniciaci�n"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importar un formato de ficheiro externo"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de Ferramentas Principal"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Abrir a mensaxe actual nunha nova fiestra"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Amosar informaci�n sobre o Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Posto"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mosta da barra de cartafoles"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mosta da barra de atallos"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Trocar mostra do selector de Deste"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uso do Xestor de Co_ntactos"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uso da _Axenda"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uso do Cliente de _Correo"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Traballar desconectado"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Acci�ns"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (AM��AME)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contacto (AM��AME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importar ficheiro..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "�_ndice"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mensaxe de correo"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mover"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Abrir..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Barra de _Atallos"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (AM��AME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Traballar desconectado"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Preferencias de Correo..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Tarxetas de Enderezo"
 
 #: views/addressbook/galview.xml.h:2
@@ -8744,9 +11778,12 @@ msgstr "Mensaxes"
 msgid "With Category"
 msgstr "Coa Categor�a"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8820,68 +11857,139 @@ msgstr "Hora do _final da reuni�n:"
 msgid "All Attendees"
 msgstr "Todas Atendidas"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B de %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoxe"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, 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
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Lixo"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Fallo na transacci�n"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Novas"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erro desco�ecido: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Outro"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contactos"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Gardar B�squeda"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "B�squeda Avanzada"
 
-#: widgets/misc/e-filter-bar.c:317 widgets/misc/e-filter-bar.h:97
-msgid "Advanced ..."
-msgstr "Avanzadas..."
-
-#: widgets/misc/e-filter-bar.h:94
-msgid "Save As ..."
-msgstr "Gardar Como..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Ver Todos"
 
-#: widgets/misc/e-filter-bar.h:96
-msgid "Edit ..."
-msgstr "Editar..."
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzado..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8891,6 +11999,10 @@ msgstr "Informaci�n"
 msgid "Warning"
 msgstr "Advertencia"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erro"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pregunta"
@@ -8904,7 +12016,7 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Bus_car"
 
@@ -8927,3 +12039,673 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Preferencias alternativas"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferencias das Tarefas..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Compa��a:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Como _Minitarxetas"
+
+#~ msgid "As _Table"
+#~ msgstr "Como unha _T�boa"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Non fomos capaces de abrir este libro de enderezos. Isto\n"
+#~ "significa que ou introduciches unha URI incorrecta, ou\n"
+#~ "que se tentou acceder a un servidor LDAP e o programa\n"
+#~ "non est� compilado con soporte LDAP. Se introduciches\n"
+#~ "unha URI comproba que sexa correcta e volve introducila.\n"
+#~ "Sen�n, probablemente tentaches acceder a un servidor\n"
+#~ "LDAP. Se desexas poder usar LDAP, necesitar�s baixar e\n"
+#~ "instalar OpenLDAP e recompilar e instalar Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir axenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gardar axenda"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro cargando a axenda:<br>M�todo non soportado"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "As alarmas saltan despois de"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activar adiando para"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
+
+#, fuzzy
+#~ msgid "Items Due Today:"
+#~ msgstr "Cousas esperadas para hoxe:"
+
+#, fuzzy
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Cousas a�nda non esperadas"
+
+#, fuzzy
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Cousas a�nda non esperadas:"
+
+#, fuzzy
+#~ msgid "Overdue Items:"
+#~ msgstr "Retrasar Cousas:"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "Rota de Tarefas"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo ata que se deba facer"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas Visuais"
+
+#~ msgid "Work week"
+#~ msgstr "Semana de traballo"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editar Tarefa"
+
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaxe colpleta"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcar a tarefa como completa"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Editar esta tarefa..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Editar Tarefa"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ir a Hoxe"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Compo�ente actualizada con �xito."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "�Non foi posible cargar o ficheiro da axenda!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "�Non foi posible ler o ficheiro da axenda!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "�Esta � unha resposta de algu�n que non foi convidado!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "�Non foi posible actualizar o almacenamento da axenda!"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "�Non se puido borrar o compo�ente da axenda!\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Enderezo ocupado"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Ocupadas: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Cancelar\n"
+#~ "Reuni�n"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizador:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Publicar\n"
+#~ "Evento"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Amosar un di�logo"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "B�sicos sobre Citas"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data de _comezo:"
+
+#~ msgid "Summary contains"
+#~ msgstr "O resume cont�n"
+
+#~ msgid "Comment contains"
+#~ msgstr "O comentario cont�n"
+
+#~ msgid "Has category"
+#~ msgstr "Ten a categor�a"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Explorando cartafol IMAP"
+
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "O cartafol %s non � seleccionable"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "Anexo Inline"
+
+#~ msgid "Send as:"
+#~ msgstr "Enviar como:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro de sinatura %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Non � un ficheiro normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "O ficheiro existe pero non se pode ler."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "O ficheiro parec�a accesible pero a chamada a open(2) fallou."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O ficheiro � moi longo (m�is de 100K).\n"
+#~ "�Est� seguro de querer inserilo?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro HTML:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "O ficheiro non ten lugar para os servicios."
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Pode seleccionar unha p�xina HTML diferente para o fondo do Resume "
+#~ "Executivo.\n"
+#~ "\n"
+#~ "D�ixeo en branco para que apareza a asignada por defecto"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s coa aplicaci�n por defecto de GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s co navegador web por defecto de GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar unha mensaxe de correo a %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Pechar %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Mover %s para a esquerda"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a dereita"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s � fileira anterior"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s � seguinte fileira"
+
+#~ msgid "Appearance"
+#~ msgstr "Aparencia"
+
+#~ msgid "Background:"
+#~ msgstr "Fondo:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O compo�ente Resume Executivo non puido inicializar Bonobo.\n"
+#~ "Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
+#~ "significa que compilou Bonobo contra GOAD no canto de OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "F�brica para o resume RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "F�brica para o compo�ente bonobo de probas."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "F�brica para o compo�ente de probas."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Comprobar servicio bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Comprobar servicio"
+
+#~ msgid "Update automatically"
+#~ msgstr "Actualizar automaticamente"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar � Enderezo"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar o cartafol \"%s\" � formato \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Pechando o cartafol actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando o cartafol antigo e abrindo"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiando as mensaxes"
+
+#~ msgid "Do you accept?"
+#~ msgstr "�Acepta?"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe n�mero %d de %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "�Mensaxe incompleta escrita na canalizaci�n!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaxe reenviada)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (sen asunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaxe reenviada (sen asunto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
+#~ "%s<br><b>Asunto:</b> %s <br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimir a mensaxe seleccionada"
+
+#~ msgid "Delete this message"
+#~ msgstr "Borrar esta mensaxe"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros de Evolution instalados con �xito."
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atallo"
+
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "View All"
+#~ msgstr "Ver Todos"
+
+#~ msgid "View all contacts"
+#~ msgstr "Ver t�dolos contactos"
+
+#~ msgid "5 Days"
+#~ msgstr "5 D�as"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crear unha nova axenda"
+
+#~ msgid "Day"
+#~ msgstr "D�a"
+
+#~ msgid "New _Event"
+#~ msgstr "Novo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Abrir Axenda"
+
+#~ msgid "Prev"
+#~ msgstr "Ant"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gardar axenda como outra cousa distinta"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir axenda"
+
+#~ msgid "About this application"
+#~ msgstr "Acerca desta aplicaci�n"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Acci�_ns"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Libro de enderezos... (AM��AME)"
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Comproba_r Nomes (AM��AME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_iar ao Cartafol... (AM��AME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Envorcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Envorcar a descrici�n Xml da Interface"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimeiro Obxecto no Cartafol (AM��AME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Re-en_viar (AM��AME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Ir � elemento seguinte"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir � elemento anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Tarefa In_completa (AM��AME)"
+
+#~ msgid "N_ext"
+#~ msgstr "Se_guinte"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Configuraci�n da Impresi�n..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programar algunha clase de reuni�n"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_Petici�n de Tarefa (AM��AME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Obxecto (AM��AME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Entrada de diario (AM��AME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Derradeiro elemento no cartafol (AM��AME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Enviar Menxaxe (AM��AME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mover ao Cartafol ... (AM��AME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (AM��AME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Obxecto non Lido (AM��AME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Engadir Servicio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Engadir un novo servicio ao Resume Executivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crear unha nova mensaxe de correo"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Preferencias do Resume Executivo..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nova Mensaxe"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "_Configurar cartafol..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar a mensaxe a un novo cartafol"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "Limpar"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr ""
+#~ "Eliminar definitivamente todas as mensaxes etiquetadas para borralas"
+
+#, fuzzy
+#~ msgid "Forward inline"
+#~ msgstr "Re-enviar inline"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Reenviar esta mensaxe in-line coa t�a, as� podes editala"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Agochar Mensaxes Borradas"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Inverter Selecci�n"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Marcar como Lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _non Lida"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaxe a un novo cartafol"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir mensaxe na impresora"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redireccionar (AM��AME: implem�ntame)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Responder a Todos"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Responder � autor"
+
+#~ msgid "S_ource"
+#~ msgstr "F_ontes"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Enviar unha resposta � persoa que che enviou esta"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Enviar unha �nica mensaxe en resposta a todo o correo seleccionado"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#, fuzzy
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver a Mensaxe en Fontes Cr�as"
+
+#~ msgid "_Reply"
+#~ msgstr "_Responder"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gardar Mensaxe Como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Por f�os"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gardar no _cartafol... (AM��AME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar a mensaxe agora"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir ficheiro de texto... (AM��AME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Asig_nar Tarefa (AM��AME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "_Solicitude de Reuni�n (AM��AME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refacer a acci�n desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "Substitu�r"
+
+#~ msgid "Replace a string"
+#~ msgstr "Substitu�r unha cadea"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Responder a _Todos (AM��AME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Mandar Informe de Estado (AM��AME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "S_altarse a Ocurrencia (AM��AME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente a mesma cadea"
+
+#~ msgid "Search for a string"
+#~ msgstr "Buscar unha cadea"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a �ltima acci�n"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcar como Completa (AM��AME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Resposta (AM��AME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Atallo da barra do Evolution"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzadas..."
+
+#~ msgid "Save As ..."
+#~ msgstr "Gardar Como..."
diff --git a/po/hu.po b/po/hu.po
index 859c8a650e..94e3df7baf 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-07-30 12:44+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-30 13:02+0200\n"
 "Last-Translator: Andr�s T�m�r <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -321,9 +321,9 @@ msgstr "%s VK�rty�ja"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:1017
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
@@ -337,14 +337,14 @@ msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/todo/todo-conduit.c:591
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nem siker�lt elind�tani a wombat kiszolg�l�t"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:777
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nem siker�lt a wombatot elind�tani"
 
@@ -450,7 +450,7 @@ msgstr "FIXME DN csatol�s s�g�sz�vege"
 
 #. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Jelsz� megjegyz�se"
 
@@ -504,15 +504,15 @@ msgstr "FIXME �tvonal s�g�sz�veg helye"
 msgid "Create path if it doesn't exist."
 msgstr "L�trehozza az �tvonalat, ha nem l�tezik"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "C�mjegyz�k szerkeszt�se"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "C�mjegyz�k hozz�ad�sa"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -520,22 +520,22 @@ msgstr ""
 "V�laszd ki, milyen c�mjegyz�ked van, �s add meg a vele kapcsolatos "
 "inform�ci�kat."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "N�v:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME N�v s�g��zenet�nek a helye"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Le�r�s:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Le�r�s s�g��zenet�nek a helye"
 
@@ -572,7 +572,7 @@ msgstr "Hozz�_ad�s"
 msgid "_Edit"
 msgstr "S_zerkeszt�s"
 
-#: addressbook/gui/component/addressbook-storage.c:115
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "Egyéb címtárak"
 
@@ -635,15 +635,6 @@ msgstr "A kateg�ria tartalmazza"
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
 
-#.
-#. * 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
-msgid "(none)"
-msgstr "(semmi)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: addressbook/gui/contact-editor/e-contact-editor.c:1536
@@ -716,10 +707,10 @@ msgstr "Factory a c�mjegyz�k n�vkiv�laszt� fel�let�hez"
 #: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "T�rl�s"
 
@@ -844,10 +835,10 @@ msgstr "_N�vjegyek..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1450
+#: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_T�rl�s"
 
@@ -1327,7 +1318,7 @@ msgstr "Lev�l k�ld�se ennek a szem�lynek"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Nyomtat�s"
@@ -1342,7 +1333,7 @@ msgstr "Bor�t�k nyomtat�sa"
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "T�rl�s"
 
@@ -1724,18 +1715,18 @@ msgstr "Sz�less�g:"
 msgid "_Font..."
 msgstr "_Bet�k�szlet..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:547
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/calendar/calendar-conduit.c:840
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 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:652
-#: calendar/conduits/todo/todo-conduit.c:655
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem siker�lt a pilot Calendar ToDo blokkj�t olvasni"
 
@@ -1882,7 +1873,35 @@ msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
 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:497
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%b %d, %a"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%b %d, %a"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1890,22 +1909,27 @@ msgstr ""
 "telep�t�sedet."
 
 #: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:306
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Nyilv�nos"
 
 #: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Szem�lyes"
 
 #: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Bizalmas"
 
 #: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
@@ -1927,56 +1951,58 @@ msgstr "K"
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Magas"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Norm�lis"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Alacsony"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "�ttetsz�"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "�tl�tszatlan"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Nem indult m�g el"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "K�sz"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Megszak�tva"
@@ -2009,12 +2035,13 @@ msgstr ""
 "A besorol�s csak 'Nyilv�nos', 'Szem�lyes', 'Bizalmas' vagy 'Semmi' lehet."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
-#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
-#: mail/mail-account-gui.c:1379 mail/mail-accounts.c:134
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
 #: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
@@ -2022,7 +2049,7 @@ msgstr ""
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:1086
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2032,38 +2059,42 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:1127
 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."
 
-#: calendar/gui/calendar-model.c:1167
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "A priorit�s 'Magas', 'Alacsony' vagy 'Nem megadott' lehet."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Nem megadott"
 
-#: calendar/gui/calendar-model.c:1221
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Az �tl�tsz�s�g csak '�ttetsz�', '�tl�tszatlan' vagy 'Semmi' lehet."
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Ism�tl�d�"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nem"
 
@@ -2374,7 +2405,7 @@ msgid "Fri"
 msgstr "P�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "P�ntek"
 
@@ -2383,7 +2414,7 @@ msgid "Mon"
 msgstr "H"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "H�tf�"
 
@@ -2404,7 +2435,7 @@ msgid "Sat"
 msgstr "Szo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -2425,7 +2456,7 @@ msgid "Sun"
 msgstr "V"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Vas�rnap"
 
@@ -2442,7 +2473,7 @@ msgid "Thu"
 msgstr "Cs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Cs�t�rt�k"
 
@@ -2467,7 +2498,7 @@ msgid "Tue"
 msgstr "K"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -2476,7 +2507,7 @@ msgid "Wed"
 msgstr "Sze"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -2550,27 +2581,27 @@ 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:154
-#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " - "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (K�sz "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "K�sz "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Esed�kes "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Esed�kes "
 
@@ -2612,7 +2643,7 @@ msgstr ""
 "Fel�l�rod?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Ment�s m�sk�nt..."
 
@@ -2744,15 +2775,134 @@ msgstr "_Befejez�s id�pontja:"
 msgid "_Start time:"
 msgstr "_Kezd�s id�pontja:"
 
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Csoportos�t�s %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Forr�s"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Levezet�"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Sz�ks�ges r�sztvev�k"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Esetleges r�sztvev�"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Nem vesz r�szt"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "V�lassz egy m�veletet"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Elfogad "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Elvet "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "K�s�rleti"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "T�r�lt"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Folyamatban"
+
 #: calendar/gui/dialogs/meeting-page.c:712
 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:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Aut�telefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Sz�ks�ges r�sztvev�k"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Esetleges r�sztvev�"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Nem vesz r�szt"
+
 #: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Felad�:"
 
-#: calendar/gui/dialogs/meeting-page.c:1445
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Feladatkiad�s..."
 
@@ -2789,7 +2939,7 @@ msgid "Role"
 msgstr "Szerep"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "�llapot"
@@ -2818,34 +2968,34 @@ msgstr "_M�sok megh�v�sa"
 msgid "_Other Organizer"
 msgstr "_M�sik szervez�"
 
-#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%Y %b %d, %a"
 
-#: calendar/gui/dialogs/recurrence-page.c:587
+#: calendar/gui/dialogs/recurrence-page.c:584
 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:952
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1108
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1116
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1286
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "el�fordul�sok"
 
@@ -2938,7 +3088,7 @@ msgid "No one"
 msgstr "Senki"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2971,102 +3121,106 @@ msgstr "_Priorit�s:"
 msgid "_Status:"
 msgstr "�ll_apot:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:840
-msgid "Edit this task"
-msgstr "A feladat szerkeszt�se"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Megnyit�s"
 
-#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Kiv�g�s"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:842 calendar/gui/e-calendar-table.c:852
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "M�sol�s"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_M�sol�s"
 
-#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Beilleszt�s"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Beilleszt�s"
 
-#: calendar/gui/e-calendar-table.c:845
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Megjel�l�s k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:846
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "A feladat t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:855
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Feladatok megjel�l�se k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Kijel�lt feladatok t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:1122
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
 
@@ -3140,13 +3294,6 @@ msgstr "%02i perces oszt�s"
 msgid "%A %d %B"
 msgstr "%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/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-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:1357
@@ -3166,121 +3313,124 @@ msgstr "de"
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "�j tal�lkoz�"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "�j mindennapos esem�ny"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "Ugor�s a mai napra"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ugr�s a _mai napra"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ugr�s d�tumra..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:468 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Megnyit�s"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "A tal�lkoz� t�rl�se"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Az el�fordul�s mozgathat�v� t�tele"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Az el�fordul�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Az �sszes el�fordul�s t�rl�se"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Ez egy esem�ny, amelyet hozz�adhatsz a napt�radhoz."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Ez egy �rtekezlet-�sszeh�v�si k�r�s."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Ez egy vagy t�bb kieg�sz�t�s az aktu�lis �rtekezlethez."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Ez egy legutols� esem�nyre vonatkoz� inform�ci�k�r�s."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Ez egy v�lasz az �rtekezlet-�sszeh�v�si k�r�sre."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Ez egy esem�ny lemond�sa."
 
-#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Ez a lev�l nem �rthet�."
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Ez egy feladat, amely hozz�adhat� a napt�radhoz."
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Ez egy felk�r�s egy feladatra."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Ez a legutols� feladatra vonatkoz� inform�ci�k�r�s."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Ez egy v�lasz a feladatfelk�r�sre."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Ez egy feladat lemond�sa."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Ez egy szabad/foglalt inform�ci�."
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Ez egy szabad/foglalt inform�ci� k�r�s."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Ez egy v�lasz a szabad/foglalt k�r�sre."
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:834
 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:845
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "A lev�l kiz�r�lag nem t�mogatott k�r�seket tartalmaz."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "A csatol�sban lev� inform�ci� nem �rv�nyes"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nem lehet friss�teni a napt�rf�jlodat!\n"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1015
 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"
 
@@ -3348,20 +3498,17 @@ msgstr "'%s' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "�j _tal�lkoz�..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Az �sszes el�fordul�s t�rl�se"
-
-#: calendar/gui/gnome-cal.c:969
+#: calendar/gui/gnome-cal.c:999
 #, 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:980
+#: calendar/gui/gnome-cal.c:1010
 #, 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"
@@ -3631,7 +3778,7 @@ msgstr "Elem nyomtat�sa"
 msgid "Print Setup"
 msgstr "Nyomtat�si be�ll�t�sok"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "A megjelen�tend� feladatmappa URI-ja"
 
@@ -3670,8 +3817,8 @@ 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' 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."
+"'%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
 msgid "SMTWTFS"
@@ -3740,7 +3887,6 @@ msgid "Unable to process spool folder"
 msgstr "Nem siker�lt feldolgozni a spool mapp�t"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. lev�l let�lt�se (%d%%)"
 
@@ -5606,11 +5752,11 @@ msgstr "F�jl megnyit�s"
 msgid "Insert File"
 msgstr "F�jl beilleszt�se"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2245
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nem siker�lt l�trehozni a lev�l�r� ablakot."
 
@@ -5898,9 +6044,9 @@ msgid "outgoing"
 msgstr "kimen�"
 
 #: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "Hozz�ad�s"
 
@@ -6025,124 +6171,120 @@ msgid "Expression"
 msgstr "Kifejez�s"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "A lev�l tov�bb�t�sa c�mre"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Fontos"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "="
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nem"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Levelez�lista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Lev�l fejl�ce"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Az lev�l meg�rkezett"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "A lev�l el lett k�ldve"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mozgat�s mapp�ba"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "akkor vagy ut�n volt"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "akkor vagy el�bb"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Olvasott"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "C�mzettek"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex illeszked�s"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "V�lasz"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Pontsz�m"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Felad�"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "�llapot be�ll�t�sa"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "M�ret (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "�gy hangzik, mint"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Forr�spostafi�k"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Adott fejl�c"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "�gy kezd�dik:"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Feldolgoz�s le�ll�t�sa"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:866
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "T�rgy"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "ut�n volt"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "el�tte volt"
 
@@ -6332,32 +6474,28 @@ msgstr "Sz�r� a _c�mzettekre"
 msgid "Filter on _Mailing List"
 msgstr "Sz�r� a _levelez�list�ra"
 
-#: mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "_Megnyit�s"
-
 #: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "�jrak�ld�s"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "M_ent�s m�sk�nt..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Nyomtat�s"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_V�lasz a felad�nak"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "V�lasz a _list�nak"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "V�lasz _mindenkinek"
 
@@ -6365,11 +6503,11 @@ msgstr "V�lasz _mindenkinek"
 msgid "_Forward"
 msgstr "Tov�bb�t�s"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "_Olvasatlan"
 
@@ -6389,7 +6527,7 @@ msgstr "_Mapp�ba mozgat�s..."
 msgid "_Copy to Folder..."
 msgstr "_Mapp�ba m�sol�s..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Vissza�ll�t�s"
 
@@ -6747,7 +6885,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Evol�ci� Postafi�k var�zsl�"
 
-#: mail/mail-config.c:1589 mail/mail-config.c:1592
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Kapcsol�d�s a kisz�lg�l�hoz..."
 
@@ -6859,8 +6997,7 @@ msgstr "Piszkozatok"
 msgid "Drafts folder:"
 msgstr "Piszkozatok mappa"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Szerkeszt�s..."
 
@@ -7224,80 +7361,90 @@ msgstr "%d post�zand�"
 msgid "%d total"
 msgstr "�sszesen %d"
 
-#: mail/mail-format.c:608
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatol�s"
 
-#: mail/mail-format.c:657
+#: mail/mail-format.c:662
 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:739
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:3
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Emailc�m:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Felad�"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "V�laszc�m"
 
-#: mail/mail-format.c:861 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "C�mzett"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:1283
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Nincs be�ll�tva GPG/PGP program."
 
-#: mail/mail-format.c:1298
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "A titkos�tott �zenet nem jelenik meg"
 
-#: mail/mail-format.c:1304
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Titkos�tott �zenet"
 
-#: mail/mail-format.c:1305
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "A titkos�t�s visszafejt�s�hez kattints az ikonra."
 
-#: mail/mail-format.c:1361
+#: mail/mail-format.c:1377
 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:1369
+#: mail/mail-format.c:1388
 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:2023
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2060
 #, 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:2039
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Mutat� FTP-helyre (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
@@ -7355,7 +7502,7 @@ msgstr ""
 "Hiba a m�velet v�grehajt�sa k�zben:\n"
 "%s"
 
-#: mail/mail-mt.c:785
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "V�rj"
 
@@ -7553,36 +7700,29 @@ msgstr "K�ld�s"
 msgid "Cancelled."
 msgstr "Megszak�tva"
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "A felhaszn�l� megszak�totta a m�veletet."
 
-#: mail/mail-tools.c:175
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nem siker�lt l�trehozni '%s' ideiglenes mbox-ot: %s"
 
-#: mail/mail-tools.c:228
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: t�rgy n�lk�l]"
-
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Tov�bb�tott �zenet - %s"
 
-#: mail/mail-tools.c:247
-msgid "Forwarded message (no subject)"
-msgstr "Tov�bb�tott �zenet (t�rgy n�lk�l)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Tov�bb�tott levelek"
 
 #: mail/mail-tools.c:469
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Tov�bb�tott �zenet-----<br><b>Felad�:</b> %s<br><b>C�mzett:</b> %"
-"s<br><b>T�rgy:</b> %s<br>"
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Tov�bb�tott levelek"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7732,31 +7872,32 @@ msgstr "%a %l:%M%p"
 msgid "Mail summary"
 msgstr "�sszegz�s a levelekr�l"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "�j h�rkiszolg�l� hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Add meg a hozz�adand� h�rkiszolg�l� URL-j�t"
 
-#: my-evolution/e-summary-preferences.c:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "Saj�t Evol�ci� be�ll�t�sai"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Hiba t�rt�nt a h�rforr�s let�lt�se k�zben.</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Hiba az RDF let�lt�se k�zben</b>"
 
@@ -7792,38 +7933,6 @@ msgstr "A Saj�t Evol�ci� nyomtat�sa sikertelen"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\n"
 
-#: my-evolution/metar.c:29
-msgid "�F"
-msgstr "�F"
-
-#: my-evolution/metar.c:29
-msgid "�C"
-msgstr "�C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "csom�"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Hgin"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "Hgmm"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "m�rf�ld"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilom�ter"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Tiszta �g"
@@ -9071,14 +9180,10 @@ msgid "Weather settings"
 msgstr "Id�j�r�s be�ll�t�sa"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "Nyomk�vet�k t�rl�se"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "angolsz�sz"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metrikus"
 
@@ -9230,7 +9335,7 @@ msgstr "T�nyleg t�r�lni akarod ezt a mapp�t: '%s'?"
 msgid "Rename folder '%s'"
 msgstr "%s mappa �tnevez�se"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9239,11 +9344,11 @@ msgstr ""
 "Nem siker�lt elk�sz�teni a megadott mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "A megadott mappan�v nem j�."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evol�ci� - �j mappa k�sz�t�se"
 
@@ -9485,91 +9590,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Ne t�vol�tsa el"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Ind�t�ikoni-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "A kijel�lt ind�t�ikon-csoport �tnevez�se erre:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Kis ikonok"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Kis ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Nagy ikonok"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Nagy ikonok mutat�sa az elemeken"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "�_j csoport..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "�j ind�t�csoport l�trehoz�sa"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "_Csoport elt�vol�t�sa..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Ind�t�csoport elt�vol�t�sa az ind�t�s�vr�l"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "C_soport �tnevez�se..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Ind�t�ikon-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Ind�t�s�v el_rejt�se"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ind�t�s�v elrejt�se"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Ind�t�ikon �tnevez�se"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Ind�t�ikon-csoport �tnevez�se erre:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Megnyit�s"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Az ind�t�ikonhoz tartoz� mappa megnyit�sa"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Megnyit�s �j  ablakban"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 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:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "�tnevez�s"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Ind�t�ikon-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
@@ -9639,7 +9748,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:173
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% k�sz)"
 
@@ -9709,7 +9817,7 @@ msgstr "Ne k�rdezze meg t�bbet."
 msgid "Evolution has found the following data sources:"
 msgstr "Az Evol�ci� a k�vetkez� adatforr�sokat tal�lta:"
 
-#: shell/main.c:92
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9738,7 +9846,7 @@ msgstr ""
 "Rem�lj�k, �lvezni fogod a kem�ny munk�nk eredm�ny�t, �s v�rjuk\n"
 "hozz�j�rul�sod! \n"
 
-#: shell/main.c:113
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9746,26 +9854,26 @@ msgstr ""
 "K�sz�nettel\n"
 "Az Evol�ci� Csapat\n"
 
-#: shell/main.c:151
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Az Evol�ci� shell nem el�rhet�."
 
-#: shell/main.c:211
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Ind�t�k�perny� letilt�sa"
 
-#: shell/main.c:212
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden �sszetev� hibakeres� �zeneteit f�jlba ir�ny�tja."
 
-#: shell/main.c:247
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem siker�lt inicializ�lni a Bonobo komponens rendszert."
 
-#: 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"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "M�sol�s"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
@@ -9779,6 +9887,10 @@ msgstr "�j n�vjegy k�sz�t�se"
 msgid "Create new contact list"
 msgstr "�j c�mlista k�sz�t�se"
 
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Kiv�g�s"
+
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Kijel�l�s kiv�g�sa"
@@ -9795,6 +9907,10 @@ msgstr "�j n�vjegy"
 msgid "New list"
 msgstr "�j lista"
 
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Beilleszt�s"
+
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "V�g�lap beilleszt�se"
@@ -9835,16 +9951,6 @@ msgstr "_N�vjegyek"
 msgid "_Contact Group"
 msgstr "_N�vjegycsoportok"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "_M�sol�s"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "_Beilleszt�s"
-
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9883,7 +9989,7 @@ msgstr "�j tal�lkoz� l�trehoz�sa"
 msgid "Create an event for the whole day"
 msgstr "Eg�sz napos esem�ny l�trehoz�sa"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ugr�s"
 
@@ -9899,10 +10005,6 @@ msgstr "Ugr�s az id�ben el�re "
 msgid "Go to _Date"
 msgstr "_D�tumra ugr�s"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Ugr�s a _mai napra"
-
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ugr�s adott d�tumra"
@@ -9911,6 +10013,10 @@ msgstr "Ugr�s adott d�tumra"
 msgid "Go to present time"
 msgstr "Ugr�s a jelenre"
 
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "�j tal�lkoz�"
+
 #: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "A nyomtatand� napt�r nyomtat�si k�pe"
@@ -9996,7 +10102,7 @@ msgstr "F� eszk�zt�r"
 msgid "Preview the printed item"
 msgstr "El�n�zeti k�pet ad a nyomtatand� elemr�l"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Nyomtat�si _k�p"
 
@@ -10487,171 +10593,207 @@ msgstr "A kijel�lt lev�l tov�bb�t�sa valakinek"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "A kijel�lt lev�l tov�bb�t�sa valakinek csatol�sk�nt"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "_K�pek bet�lt�se"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "_Fontos"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "_Nem fontos"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "A kijel�lt leveleket elolvasottnak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "A kijel�lt leveleket fontosnak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 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:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "A kijel�lt leveleket nem fontosnak jel�li meg"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "A kijel�lt leveleket t�rl�sre jel�li ki"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mozgat�s"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "A kijel�lt levelek mozgat�sa egy m�sik mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "K�vetkez�"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "K�vetkez� lev�l"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "K�vetkez� lev�l"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "_Sz�l kijel�l�se"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "K�vetkez� lev�l"
+
+#: ui/evolution-mail-message.xml.h:56
 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:52
+#: ui/evolution-mail-message.xml.h:57
 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:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "El�n�zeti k�pet ad a nyomtatand� lev�lr�l"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "El�z�"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "El�z� lev�l"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "El�z� lev�l"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "El�z� lev�l"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Lev�l nyomtat�sa..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Nyomtat�si k�p..."
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Print message to the printer"
-msgstr "Lev�l nyomtat�sa a nyomtat�n"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Lev�l nyomtat�sa"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "V�lasz"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "V�lasz mindenkinek"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_Keres�s a lev�lben"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Lev�l ment�se sz�vegf�jlk�nt"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 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:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Lev�l forr�s�nak mutat�sa"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Teljes _fejl�c mutat�sa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Lev�l megjelen�t�se a szok�sos st�lusban"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Lev�l megjelen�t�se a teljes fejl�ccel"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Lev�l nyers forr�s�nak mutat�sa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "A kijel�lt levelek t�rl�s�nek visszavon�sa"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VMappa a _levelez�list�ra..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VMappa a _felad�ra..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VMappa a _c�mzettekre..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VMappa a _t�rgyra..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Sz�r�k alkalmaz�sa"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_M�sol�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Sz�r� _gy�rt�sa lev�lb�l"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Lev�l _tov�bb�t�sa"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Lev�l _megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "M_ozgat�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Szok�sos megjelen�t�s"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "Lev�l _megnyit�sa"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Lev�l �_jrak�ld�se"
 
@@ -10920,45 +11062,47 @@ msgid "Re_fresh Task"
 msgstr "_Feladatok friss�t�se"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "A napt�r be�ll�t�sai"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kijel�lt feladat m�sol�sa"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "�j feladat l�trehoz�sa"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Kijel�lt feladat kiv�g�sa"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Kijel�lt feladatok t�rl�se"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "�j feladat"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Feladat beilleszt�se a v�g�lapr�l"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Feladat ment�se m�sk�nt"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Feladatn�zet be�ll�t�sai"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "TasksPreferences"
-msgstr "Feladatok be�ll�t�sai"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Feladatok be�ll�t�sai"
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Feladat"
 
-#: ui/evolution-tasks.xml.h:19
-msgid "_Tasks Settings..."
-msgstr "_Feladatok be�ll�t�sai"
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Evol�ci� n�vjegye..."
@@ -11194,10 +11338,6 @@ msgstr "Kateg�ri�kkal"
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "K�s�rleti"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Foglalt"
@@ -11284,11 +11424,6 @@ msgstr "N�zet megad�sa"
 msgid "MTWTFSS"
 msgstr "HKSCPSV"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%Y %B"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Most"
@@ -11395,11 +11530,11 @@ msgstr "Keres�s ment�se"
 msgid "Advanced Search"
 msgstr "Halad� keres�s"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Halad�..."
 
@@ -11452,6 +11587,70 @@ msgstr "init_corba(): nem siker�lt a GNOME inicializ�l�sa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Feladatn�zet be�ll�t�sai"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Feladatok be�ll�t�sai"
+
+#~ msgid "(none)"
+#~ msgstr "(semmi)"
+
+#~ msgid "Edit this task"
+#~ msgstr "A feladat szerkeszt�se"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ugor�s a mai napra"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Az �sszes el�fordul�s t�rl�se"
+
+#~ msgid "Forward to Address"
+#~ msgstr "A lev�l tov�bb�t�sa c�mre"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: t�rgy n�lk�l]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Tov�bb�tott �zenet (t�rgy n�lk�l)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Tov�bb�tott �zenet-----<br><b>Felad�:</b> %s<br><b>C�mzett:</b> "
+#~ "%s<br><b>T�rgy:</b> %s<br>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ msgid "�C"
+#~ msgstr "�C"
+
+#~ msgid "knots"
+#~ msgstr "csom�"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "Hgin"
+
+#~ msgid "mmHg"
+#~ msgstr "Hgmm"
+
+#~ msgid "miles"
+#~ msgstr "m�rf�ld"
+
+#~ msgid "kilometers"
+#~ msgstr "kilom�ter"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "Nyomk�vet�k t�rl�se"
+
+#~ 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"
 
@@ -11578,8 +11777,7 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid ""
 #~ "Notification about your journal entry starting on %s and ending on %s"
 #~ msgstr ""
-#~ "Figyelmeztet�s a napl�bejegyz�sre, amely %s-kor kezd�dik �s %s-kor "
-#~ "v�gz�dik"
+#~ "Figyelmeztet�s a napl�bejegyz�sre, amely %s-kor kezd�dik �s %s-kor v�gz�dik"
 
 #~ msgid "Notification about your journal entry starting on %s"
 #~ msgstr "Figyelmeztet�s a napl�bejegyz�sre, amely %s-kor kezd�dik"
@@ -11784,12 +11982,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Delete this message"
 #~ msgstr "A lev�l t�rl�se"
 
-#~ msgid "Previous message"
-#~ msgstr "El�z� lev�l"
-
-#~ msgid "Next message"
-#~ msgstr "K�vetkez� lev�l"
-
 #~ msgid "Activate"
 #~ msgstr "Aktiv�l�s"
 
@@ -11838,12 +12030,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Add to Calendar"
 #~ msgstr "Hozz�ad�s a napt�rhoz"
 
-#~ msgid " Accept "
-#~ msgstr " Elfogad "
-
-#~ msgid " Decline "
-#~ msgstr " Elvet "
-
 #~ msgid " Tentative "
 #~ msgstr " K�s�rleti "
 
@@ -11863,15 +12049,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ "�rtekezlet\n"
 #~ "lemond�sa"
 
-#~ msgid "Chair"
-#~ msgstr "Levezet�"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Nem vesz r�szt"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Esetleges r�sztvev�"
-
 #~ msgid "Organizer: "
 #~ msgstr "Szervez�: "
 
@@ -11882,9 +12059,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ "Esem�ny\n"
 #~ "k�zz�t�tele"
 
-#~ msgid "Required Participant"
-#~ msgstr "Sz�ks�ges r�sztvev�k"
-
 #~ msgid "Could not test lock file for %s: %s"
 #~ msgstr "Nem siker�lt tesztelni %s z�rol�f�jlj�t: %s"
 
@@ -12799,9 +12973,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: _Feljegyz�s"
 
-#~ msgid "Group %i"
-#~ msgstr "Csoportos�t�s %i"
-
 #~ msgid "C_lassification:"
 #~ msgstr "B_esorol�s"
 
diff --git a/po/it.po b/po/it.po
index dcf5a9a93f..030eef6819 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.8\n"
-"POT-Creation-Date: 2001-04-20 02:43+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-03-23 10:23-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -13,11 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabbrica per importare i file GnomeCard in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importa i file GnomeCard in Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tessera:"
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +35,7 @@ msgstr ""
 "\n"
 "Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +43,7 @@ msgstr ""
 "\n"
 " Prefisso:"
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +51,7 @@ msgstr ""
 "\n"
 " Dato:"
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +59,7 @@ msgstr ""
 "\n"
 " Addizionale:"
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +67,7 @@ msgstr ""
 "\n"
 " Famigila:"
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +75,7 @@ msgstr ""
 "\n"
 " Suffisso:"
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +83,7 @@ msgstr ""
 "\n"
 "Data di nascita:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +91,7 @@ msgstr ""
 "\n"
 "Indirizzo:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,13 +99,13 @@ msgstr ""
 "\n"
 " Casella Postale: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -103,7 +113,7 @@ msgstr ""
 "\n"
 " Via:   "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -111,7 +121,7 @@ msgstr ""
 "\n"
 " Citt�:     "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -119,7 +129,7 @@ msgstr ""
 "\n"
 " Regione:       "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -127,7 +137,7 @@ msgstr ""
 "\n"
 " Codice di avviamento postale:  "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -135,7 +145,7 @@ msgstr ""
 "\n"
 " Stato:    "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -143,7 +153,7 @@ msgstr ""
 "\n"
 "Etichetta di spedizione: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -151,7 +161,7 @@ msgstr ""
 "\n"
 " Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -159,7 +169,7 @@ msgstr ""
 "\n"
 "Telefono:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -167,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -175,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -183,7 +193,7 @@ msgstr ""
 "\n"
 "Programma di posta: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +201,7 @@ msgstr ""
 "\n"
 "Fuso orario: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,7 +209,7 @@ msgstr ""
 "\n"
 "Posizione Geografica: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -207,7 +217,7 @@ msgstr ""
 "\n"
 "Occupazione:"
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -215,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -223,7 +233,7 @@ msgstr ""
 "\n"
 " Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -231,7 +241,7 @@ msgstr ""
 "\n"
 " Unit�:"
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -239,7 +249,7 @@ msgstr ""
 "\n"
 " Unit�2:"
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -247,7 +257,7 @@ msgstr ""
 "\n"
 " Unit�3:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -255,7 +265,7 @@ msgstr ""
 "\n"
 " Unit�4:"
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -263,7 +273,7 @@ msgstr ""
 "\n"
 "Categorie:"
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -281,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -289,7 +299,7 @@ msgstr ""
 "\n"
 "Stringa Unica: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -297,23 +307,25 @@ msgstr ""
 "\n"
 "Chiave Pubblica: "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Fabbrica per importare i file GnomeCard in Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Messaggi Multipli"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importa i file GnomeCard in Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Inserire la password per %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
@@ -326,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
@@ -342,725 +354,846 @@ msgstr "Impossibile avviare wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#, fuzzy
+msgid "A Bonobo control for an address popup."
+msgstr "Un controllo di Bonobo che visualizza un indirizzo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un controllo di Bonobo che visualizza un indirizzo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visore di minicard per la rubrica di Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Componente di Evolution per gestire i contatti."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fabbrica per il controllo delle Minicard per la rubrica"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fabbrica per il componente della rubrica di Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fabbrica per il controllo degli esempi della Rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "File"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo di rubrica sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Nessuno (modo anonimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Password"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo di auth sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Uno"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo di ambito sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Bind DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Ricorda questa password"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Host:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Root DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porta:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Ambito della Ricerca:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autenticazione:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Percorso:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Crea il path se non esiste"
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Modifica Rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Aggiungi rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Selezionare il vostr tipo di rubrica, e inserirne le informazioni rilevanti."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Aggiungi"
+msgid "Addressbook Sources"
+msgstr "Sorgenti della Rubrica"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Elimina"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Aggiungi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Altri Contatti"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Inserire la password per %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Impossibile aprire la rubruca"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Qualunque campo contiene"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Il nome contiene"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Email contiene"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Il nome contiene"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "La URI visualizzata dal Browser delle cartelle"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Email principale"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Scegliere un file"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crea un nuovo contatto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Modifica Rubrica"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Modifica Informazioni del Contatto"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Aggiungi ai Contatti"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Indirizzo Email:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Disabilita Query"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Abilita Query (Pericoloso!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+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:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Rimuovere"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Rimuovere Tutti"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Invio Email"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Altri Contatti"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinatari del messaggio:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleziona Nomi"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleziona un nome da:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categoria:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Cerca"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Anni_versario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Ufficio"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax Ufficio"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontatti..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor dei Contatti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Dettagli"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Memorizza Come:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generale"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nuovo tipo di telefono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_te:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizzazione:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipi di Telefono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Email principale"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Vuole ricevere messaggi in _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Indirizzo pagina web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Aggiungi"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Indirizzo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome dell'_Assistente:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Co_mpleanno:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Ufficio"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compagnia:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contatti..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Dipartimento:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nome e Cognome..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Titolo:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome del _Manager:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "C_ellulare"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Ufficio:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Professione:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Coniuge:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Indirizzo a cui _spedire"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Cancellare il Contatto?"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Ufficio2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Ditta"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Impaginatore"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principale"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Aggiunta veloce di un Contatto"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Modifica Interamente"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nome e cognome"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Indirizzo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Stato:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Citt�:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Casella Postale:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stato/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/CAP:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Verifiare Nome e Cognome"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dott."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Egr."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Sig.na"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Sig."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Sig.ra"
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sig.ra"
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Cognome:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Secondo nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "S_uffisso:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Come _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Come _Tabella"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Inserire la password per %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Impossibile aprire la rubruca"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Impossibile aprire questa rubruca.  Questo significa che \n"
-"� stata inserita una URI non corretta, oppure che si �\n"
-"cercato di accedere a un server LDAP senza avere il supporto \n"
-"LDAP compilato.  Se si � inserita una URI, controllarne \n"
-"la correttezza ed inserirla nuovamente.  Altrimenti, � \n"
-"probabile che si sia cercato di accedere ad un server LDAP. \n"
-"Se si desidera usare LDAP, � necessario scaricare e \n"
-"installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Mostra Tutto"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avanzato..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Qualunque campo contiene"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Il nome contiene"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Email contiene"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI visualizzata dal Browser delle cartelle"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Altri Contatti"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "File"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo di rubrica sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Nessuno (modo anonimo)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Password"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Tipo di auth sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Tipo di ambito sconosciuto"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome del file:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Bind DN:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Dicembre"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Ricorda questa password"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Host:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Porta:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Rimuovere"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor dei Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Root DN:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor dei Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Ambito della Ricerca:"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autenticazione:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Percorso:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Crea il path se non esiste"
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Modifica Rubrica"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Aggiungi rubrica"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Selezionare il vostr tipo di rubrica, e inserirne le informazioni rilevanti."
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nome:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Sorgenti della Rubrica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Elimina"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Modifica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Disabilita Query"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Abilita Query (Pericoloso!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Modifica Informazioni del Contatto"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Aggiungi ai Contatti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-#, fuzzy
-msgid "A Bonobo control for an address popup."
-msgstr "Un controllo di Bonobo che visualizza un indirizzo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un controllo di Bonobo che visualizza un indirizzo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visore di minicard per la rubrica di Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Componente di Evolution per gestire i contatti."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabbrica per il controllo delle Minicard per la rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabbrica per il componente della rubrica di Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabbrica per il controllo degli esempi della Rubrica"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-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:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Rimuovere"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Rimuovere Tutti"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Trova..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatari del messaggio:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleziona Nomi"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleziona un nome da:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Cerca"
 
@@ -1172,175 +1305,272 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Send contact to other"
 msgstr "_Invia contatto a altri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Invia un _messaggio al contatto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Stampa _Busta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Sorgenti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Non collegato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "File non trovato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operazione non supportata"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Annullato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Errore I/O"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Errore nella lettura dei dati: \n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Cliccare qui per aggiungere un contatto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Memorizza Come:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Richiamare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Ditta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sito Internet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Dipartimento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Posizione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Professione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Coniuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Free-busy URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Completato"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Caricamento del calendario..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1383,7 +1613,8 @@ msgid "Dimensions:"
 msgstr "Dimensioni:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Carattere..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1443,7 +1674,6 @@ msgid "Margins"
 msgstr "Margini"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
@@ -1524,145 +1754,321 @@ msgid "Width:"
 msgstr "Larghezza:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Carattere..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "File non trovato"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+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:2
+msgid "Evolution calendar executive summary component."
+msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visore iTip/iMip del calendario di Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Componente di Evolution per gestire il calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+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
+msgid "Factory for the Evolution calendar component."
+msgstr "Fabbrica per il componente del calendario di Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+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:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fabbrica per il controllo del Calendario di esempio"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabbrica per il componente del calendario di Evolution."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Servizio di notifica dell'avviso sonoro"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Fabbrica per il servizio di notifica dell'avviso sonoro"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Mostra informazioni su Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Avviso alle %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Chiudi"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Suoneria"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Suoneria (minuti)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Modifica appuntamenti"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Indice non disponibile."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Promemoria appuntamento alle "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Suoneria"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "Impossibile inizializzare GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Impossibile inizializzare Bonobo"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Apri calendario"
+#: calendar/gui/alarm-notify/notify-main.c:115
+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:332
-msgid "Save calendar"
-msgstr "Salva calendario"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 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:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Altezza"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normale"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Basso"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completato"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Annullato"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1673,7 +2079,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1681,17 +2087,21 @@ msgstr ""
 "'nessuna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1701,145 +2111,293 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "la priorit� dev'essere 'Alta', 'Normale', 'Bassa' oppure 'Non definita.'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Non definito"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "La trasparenza dev'essere 'Treasparente', 'Opaca' oppure 'Nessuna'."
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "S�"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "No"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Visualizza"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "_Settimana lavorativa"
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Errore nel caricare il calendario</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Settimana"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Errore nel caricare il calendario:<br>Metodo non supportato"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mese"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Visualizza"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "La URI che il calendario visualizzer�"
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Mostra appuntamenti"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Avviso Sonoro"
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Mostra obiettivi"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinatari del messaggio:"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Caricamento del Calendario"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Visualizza opzioni"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "La URI che il calendario visualizzer�"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Promemoria appuntamento alle "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Suoneria"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Servizio di notifica dell'avviso sonoro"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Header del messaggio"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Fabbrica per il servizio di notifica dell'avviso sonoro"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Emetti un suono"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Impossibile inizializzare GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Esegui programma"
 
-#: calendar/gui/alarm-notify/notify-main.c:109
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
-"Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Avviso alle %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "giorni"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Aggiorna ogni "
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Indice non disponibile."
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "Ore"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Chiudi"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Modifica appuntamenti"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d giorni"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Suoneria (minuti)"
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 giorno"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d settimane"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 settimana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d ore"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 ora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minuti"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minuto"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d secondi"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 secondo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Emetti un suono"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Visualizza tutti gli header del messaggio"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Invia un email"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Esegui programma"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " prima dell'inizio di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " dopo l'inizio di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " prima della fine di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " dopo la fine di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data  e Ora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Promemoria"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Indice:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opzioni"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "dopo"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "prima"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "giorno(i)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "termine dell'appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "Ora (e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minuto(i)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "inizio dell'appuntamento"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1870,36 +2428,38 @@ msgid "60 minutes"
 msgstr "60 minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Interruzione avviso sonoro dopo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Avviso Sonoro"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Emette un suono quondo appare la finestra di avviso"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferenze del Calendario"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colori"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimi i fine settimana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Opzioni del navigatore delle date"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1907,436 +2467,932 @@ msgid "Defaults"
 msgstr "Predefinito"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Visualizza opzioni"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Visualizza"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Scadenza"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Attiva la suoneria per "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Fine della giornata: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primo giorno della settimana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Venerd�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Evidenzia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Scadenze per oggi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Scadenze per oggi:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Non ancora scaduti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Non ancora scaduti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Luned�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Compiti scaduti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Compiti scaduti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Prendi un colore"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Priorit�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Compiti scaduti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Ricordami tutti gli appuntamenti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Promemoria"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sabato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Mostra"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Mostra i termini dell'appuntamento"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Mostra i numeri delle settimane"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inizio della giornata:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domenica"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Obiettivi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Scadenze per oggi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Gio"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Gioved�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Cronometra fino al termine"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Posizione"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Suddivisione del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Fuso orario: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Marted�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Avviso visivo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mercoled�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Settimana lavorativa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "_Settimana lavorativa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuti prima che inizino."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "secondi."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Sicuro di voler cancellare questo account?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Completato"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Completato"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Scadenza"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Modifica Appuntamenti"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appuntamento - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Obiettivo - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Voce nell'agenda - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Niente indice"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Sovrascrivere il file?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Esiste gi� un file con questo nome.\n"
+"Sovrascriverlo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Salva con nome..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 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:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, 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:91
+#: calendar/gui/dialogs/delete-comp.c:105
 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/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Salvare le modifiche?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Scegliere un file"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sezioni:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuso orario: "
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Appuntamento"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Promemoria"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Ricorrenza"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Annulla Riunione"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Eventi della giornata"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificazione"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data  e Ora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Completato in data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vato"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "In corso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pub_blico"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data di _inizio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "_Indice:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Obiettivo"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidenziale"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contatti..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Ora di _fine:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Sca_denza:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Ora di inizio:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Priorit�:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nome del Gruppo:"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Modifica Obiettivo"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Alimentazione della carta:"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Niente indice"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appuntamento - %s"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Obiettivo - %s"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Partecipante Richiesto"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Voce nell'agenda - %s"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Partecipante Opzionale"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Categorie"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Non Partecipante"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Aggiungi Azione"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "Accetta"
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Annulla"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativo"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminato"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "In corso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Partecipante Richiesto"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Partecipante Opzionale"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Non Partecipante"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Visto"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Elimina..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Partecipante"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Ultimato il"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Termine"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Eliminato"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Inizio"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Eliminato"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Posizione Geografica"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Manager"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Percentuale completata"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Dicembre"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Indice"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Trasparenza"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Ruolo"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Avvisi Sonoro"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Fare clic qui per aggiungere un obiettivo"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizzatore:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizzatore:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Invita altri..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizzatore:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+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:938
+msgid "on"
+msgstr "il"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "giorno"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "il"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ricorrenze"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Ricorrenza personalizzata"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Ogni"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Eccezioni"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Nessuna Ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Anteprima"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regole di ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Semplice ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modifica"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "per"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mese(i)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "fino a"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "Settimana(e)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Completato in data:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Eliminato"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Eliminato"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nessuno "
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Obiettivo"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "In corso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data di _inizio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "Sca_denza:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Priorit�:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Segna come Completato"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Apri"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Segna l'obiettivo come raggiunto"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "Modifica questo obiettivo..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copia"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Modifica obiettivo"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Incolla"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Segna come Completato"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Elimina questo obiettivo"
 
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Fare clic qui per aggiungere un obiettivo"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Avvisi Sonoro"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorie"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Completato"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Ultimato il"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Scadenza"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Termine"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Posizione Geografica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Priorit�"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Inizio"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Indice"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Obiettivi"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Trasparenza"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -2344,150 +3400,156 @@ 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 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:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nuovo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nuovo Evento dell'intera giornata"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Vai a Oggi"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Apri"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Elimina questo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Pianifica una Riunione"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Elimina tutte le Ricorrenze"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Elimina Tutte le Ricorrenze"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Impossibile aggiornare il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Compnente aggiornata con successo."
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "Indirizzo a cui _spedire"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Si � verificato un errore nel caricare il file del calendario."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Impossibile aprire il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Impossibile caricare il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr ""
+"Questo messaggio non ha l'oggetto.\n"
+"Inviare lo stesso?"
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Impossibile leggere il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Questa � la risposta di qualcuno che non era stato invitato!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Impossibile aggiornare l'archivio del calendario."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Impossibile cancellare il componente del calendario!\n"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Componente aggiornato con successo."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Tipo di componente del calendario non riconosciuto."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Aggiungi al Calendario"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-#, fuzzy
-msgid " Accept "
-msgstr "Accetta"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
-msgid " Decline "
-msgstr "Annulla"
+msgid "The message does not appear to be properly formed"
+msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:816
-#, fuzzy
-msgid " Tentative "
-msgstr "Tentativo"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Aggiorna Calendario"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Annulla Riunione"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Impossibile aggiornare il file del calendario!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Impossibile aprire il file del calendario!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2502,27 +3564,23 @@ msgstr "--a--"
 msgid "Calendar Message"
 msgstr "Messaggio del Calendario"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Caricamento del Calendario"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Caricamento del calendario..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizzatore:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
 msgid "Server Message:"
 msgstr "Salva Messaggio con nome..."
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Indice:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "termine"
@@ -2531,102 +3589,21 @@ msgstr "termine"
 msgid "date-start"
 msgstr "inizio"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Indirizzo del partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Partecipanti:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Annulla \n"
-"Riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Inviti alla riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Non Partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Partecipante Opzionale"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizzatore: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Pubblica\n"
-"Evento"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Richiesta\n"
-"Riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Partecipante Richiesto"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Ruolo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Organizza\n"
-"Tempo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1054
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Tutti"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categoria:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossibile caricare l'obiettivo in `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Il metodo richiesto per caricare `%s' non � supportato"
@@ -2634,325 +3611,22 @@ msgstr "Il metodo richiesto per caricare `%s' non � supportato"
 #. 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Nuovo Appuntamento..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Elimina Tutte le Ricorrenze"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Eventi della giornata"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Appuntamenti di Base:"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Ricorrenza personalizzata"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Ogni"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Eccezioni"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifica"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Nessuna Ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Emetti un suono"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Anteprima"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regole di ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Promemoria"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Esegui programma"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Invia un email"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Impostazioni..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Mostra un dialogo"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Semplice ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Ora di _fine:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Ora di inizio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data di _inizio:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "dopo"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "prima"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "giorno(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "termine dell'appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "per"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "Ora (e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minuto(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mese(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "inizio dell'appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "fino a"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "Settimana(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "anno(i)"
-
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Modifica Appuntamenti"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "giorno"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "ricorrenze"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Questo appuntamento contiene ricorrenze che Evolution non pu� modificare."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr " %d giorni"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 giorno"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d settimane"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " 1 settimana"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d ore"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 ora"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuti"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " 1 minuto"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d secondi"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 secondo"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " prima dell'inizio di un appuntamento"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " dopo l'inizio di un appuntamento"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " prima della fine di un appuntamento"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " dopo la fine di un appuntamento"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-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:2
-msgid "Evolution calendar executive summary component."
-msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visore iTip/iMip del calendario di Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Componente di Evolution per gestire il calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-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
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabbrica per il componente del calendario di Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-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:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabbrica per il controllo del Calendario di esempio"
-
-#: calendar/gui/gnome-cal.c:223
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Show all "
-msgstr "Mostra Tutto"
-
-#: calendar/gui/gnome-cal.c:237
-#, fuzzy
-msgid "Summary contains"
-msgstr "Email contiene"
-
-#: calendar/gui/gnome-cal.c:238
-#, fuzzy
-msgid "Description contains"
-msgstr "Descrizione:"
-
-#: calendar/gui/gnome-cal.c:239
-#, fuzzy
-msgid "Comment contains"
-msgstr "Il nome contiene"
-
-#: calendar/gui/gnome-cal.c:240
-#, fuzzy
-msgid "Has category"
-msgstr "Categoria:"
+msgid "New _Appointment..."
+msgstr "Nuovo Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
@@ -2978,236 +3652,256 @@ msgid "Go To Date"
 msgstr "Vai alla data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Vai a oggi"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Gennaio"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Luglio"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Giugno"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Maggio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Ottobre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Vai a oggi"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Obiettivi"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Data odierna (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Settimana corrente (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mese corrente (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Anno corrente (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1465
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Stampa questo articolo"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Impostazione pagina"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella degli obiettivi da visualizzare"
 
@@ -3253,94 +3947,113 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMGVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la rubruca"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Impossibile aprire la rubruca"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Scaricamento del messaggio %s"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "_Invia messaggio"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "Completato"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -3376,14 +4089,33 @@ msgstr "� stata effettuata una ricerca su un header sconosciuto: %s"
 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
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Impossibile ridirigere: %s  "
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Impossibile fare un fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3400,114 +4132,109 @@ msgstr "Rimozione del lock usando fcntl(2) non riuscita: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Rimozione del lock usando flock(2) non riuscita: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Impossibile controllare il file di posta %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Impossibile aprire il file di posta %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, 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:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Impossibile verificare il file di blocco per %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Errore nella lettura del file di posta: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Errore nella scrittura del file temp di posta: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Impossibile ridirigere: %s  "
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Impossibile fare un fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Fallito lo spostamento della posta: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Errore sconosciuto)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Errore nella lettura del file di posta: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Errore nella scrittura del file temp di posta: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Digitare la %s passphrase per %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Digitare la %s passphrase"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1061 camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Non � stata fornita alcuna password."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1068
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Impossibile creare file temporaneo: %s  "
 
-#: camel/camel-pgp-context.c:1051
+#: camel/camel-pgp-context.c:1063
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Nessun destinatario specificato"
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3526,37 +4253,37 @@ msgstr "Impossibile caricare %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servizio per %s su  %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Connessione annullata"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Il server si � disconnesso inaspettatamente"
 
@@ -3666,71 +4393,80 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "Autenticazione fallita"
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Fornitore di cartelle email virtuali "
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 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:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3739,11 +4475,73 @@ msgstr ""
 "Impossibile creare la directory %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
-msgid "Trash"
-msgstr "Cestino"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Digitare la %s passphrase per %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Il file noon esiste."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Il file noon esiste."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Fallito l'invio dello username al server"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "_Invia messaggio"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
@@ -3752,67 +4550,95 @@ msgstr ""
 "Impossibile il file %s:\n"
 "%s "
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Non � presente il messaggio: %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Non � presente il messaggio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"� possibile modificare solo i messaggi\n"
+"salvati nella cartella Bozze."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Errore sconosciuto"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "La risposta del server � terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Impossibile creare la directory %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:349
-msgid "Scanning IMAP folder"
-msgstr "Scansione delle cartelle IMAP in corso"
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Salvataggio messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Salvataggio messaggi"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 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-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Impossibile creare la directory %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Crea una nuova email"
@@ -3822,7 +4648,7 @@ msgstr "Crea una nuova email"
 msgid "Check for new messages in all folders"
 msgstr "Copia messaggio in una nuova cartella"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -3858,28 +4684,28 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, 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:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Non � stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3890,98 +4716,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
-#, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Mostra la cartella selezionata"
-
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Impossibile creare la directory %s: %s"
+msgid "No such folder %s"
+msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Formato MH di UNIX delle directory della posta"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 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:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "File di mailbox standard per Unix"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Per archiviare la posta locale in formato mbox standard"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "File di posta UNIX qmail maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Per archiviare la posta locale nelle directory qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "File di posta UNIX qmail maildir-format"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Per archiviare la posta locale nelle directory qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, 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:283
+#: camel/providers/local/camel-local-store.c:279
 #, 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:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, 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:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3990,18 +4826,19 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4011,14 +4848,14 @@ msgstr ""
 "Impossibile aprire la cartella `%s':\n"
 "%s "
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4028,28 +4865,43 @@ msgstr ""
 "Impossibile creare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � una directory maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "non � una directory maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Impossibile creare la cartella `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Impossibile aprire la casella di posta: %s: %s\n"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Impossibile aprire la casella di posta: %s: %s\n"
@@ -4059,9 +4911,12 @@ msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 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:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4070,11 +4925,13 @@ msgstr ""
 "Impossibile prendere il messaggio: %s dalla cartella: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
@@ -4119,85 +4976,102 @@ 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:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Creazione indice della cartella"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Impossibile aprire la cartella: %s: indice creato a partire dalla posizione "
 "%ld: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: 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-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Impossibile aprire la cartella per la quale creare l'indice %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, 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:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
@@ -4207,39 +5081,97 @@ msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' non � una directory."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Impossibile aprire la casella di posta: %s: %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' non � un file regolare."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "La cartella `%s' non esiste."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "File di posta locale: %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Impossibile aprire il file di posta temporaneo %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Impossibile chiudere la cartella sorgente %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Username rifiutato dal server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fallito l'invio dello username al server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Il server ha rifiutato username/password"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Messaggio %s non trovato."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Impossibile prendere la lista dei gruppi dal server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
@@ -4252,17 +5184,17 @@ msgstr "USENET news"
 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:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4270,8 +5202,8 @@ msgstr ""
 "Con questa opzione l'autenticazione con il server NNTP avviene usando una "
 "password in testo semplice."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
@@ -4324,7 +5256,7 @@ msgstr "Non cancellare i messaggi dal server"
 msgid "Delete after %s day(s)"
 msgstr "Elimina questo obiettivo"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4362,27 +5294,27 @@ msgstr ""
 "Con questa ci si connette al server POP usando Kerberos 4 per "
 "l'autenticazione."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Impossibile autenticare il KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, 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:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, 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:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4391,12 +5323,12 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio dello username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4404,7 +5336,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:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4413,13 +5345,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4474,7 +5406,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4483,128 +5415,128 @@ 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:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Errore di sintassi, comando non riconosciuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Errore di sintassi nei parametri o negli argomenti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parametro del comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Stato del sistema, o risposta di aiuto del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Messaggio di Aiuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servizio pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Il servizio sta chiudendo il canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "L'azione di posta richiesta � corretta, completata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Azione richiesta non effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Azione richiesta interrotta: errore di processo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Utente non locale; tentare <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Azione richiesta non effettuata: archivio di sistema insufficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 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:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transazione fallita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "� necessaria una password di transizione."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Il meccanismo di autenticazione � troppo debole"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "� richiesta la crittografia per il meccanismo di autenticazione richiesto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4615,237 +5547,243 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 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:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Invio messaggio"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autenticazione"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Richiesta AUTH scaduta: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Errore nella risposta di RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Errore nella risposta di QUIT: %s: non fatale<"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Allega un file"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Rimuovere gli oggetti selezionati dalla lista degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Aggiungere allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1054
-msgid "Attachment"
-msgstr "Allegato"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propriet� dell'allegato"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome del file:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "allegato inlinea"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Invia come :"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:723
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:725
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 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:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4853,41 +5791,100 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: composer/e-msg-composer.c:528
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Allega un file"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Impossibile aprire il file firma: %s\n"
+"Impossibile il file %s:\n"
 "%s "
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Errore nel caricare il file: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Avviso"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 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:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Errore nel salvare il file: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Impossibile creare il file di output: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Impossibile creare il file di output: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Errore nel salvare i messaggi in: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4897,47 +5894,29 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr "Il file noon esiste."
-
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
-msgstr "Non � un file regolare."
-
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr "File esistente ma illeggibile."
-
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
-msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
-
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Questo file � molto grande (pi� di 100K).\n"
-"Inserire ugualmente?"
-
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
-msgstr "Si � verificato un errore durante le lettura del file."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Inserici un file di testo..."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4945,7 +5924,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione, poich� non �\n"
 "stata ancora configurata nessuna identit� nel componente della posta."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
@@ -4962,304 +5941,122 @@ msgid "calendar information"
 msgstr "informazioni sul calendario"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Componente di Evolution per il sommario esecutivo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fabbrica per il componente del sommario esecutivo di Evolution"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"� possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
-"Esecutivo.\n"
-"\n"
-"Lasciare in bianco per la pagina predefinita. "
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Apre %s con l'applicazione di GNOME predefinita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Apre %s con il browser di GNOME predefinito"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Invia un email a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Cambia la vista con %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Esegui %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Chiudi %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Sposta %s a sinistra"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Sposta %s a destra"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Sposta %s alla riga precedente"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Sposta %s alla riga successiva"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configura %s"
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Impossibile aprire il file HTML:\n"
-"%s "
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Errore nella lettura dei dati: \n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr "Il file non ha un posto per i servizi.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aspetto"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Sfondo:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Il componente del sommario esecutivo non riesce a inizializzare Bonobo.\n"
-"Nel caso ci sia un messaggio circa il RootPOA, probabilmente significa che\n"
-"Bonobo � stato compilato con GOAD invece che con OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fabbrica per il sommario RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Indice RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fabbrica per il componente di prova di bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fabbrica per il componente di prova."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Prova servizio bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Prova servizio"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Errore"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Aggiorna automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Aggiorna adesso"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Aggiorna ogni "
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuti"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "anno"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anni"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mese"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesi"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "settimana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "settimane"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "giorni"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "Ora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "Ore"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "secondo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " secondi"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Ti sei dimenticato di scegliere una data."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Hai scelto un adata non valida"
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5269,7 +6066,7 @@ msgstr ""
 "con la data di avvio del filtro o di apertura\n"
 "del vfolder, qualunque essa sia"
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5277,7 +6074,7 @@ msgstr ""
 "La data del messaggio verr� confrontata\n"
 "con quella specificata qui."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5288,28 +6085,36 @@ msgstr ""
 "\"una settimana fa\", ad esempio."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "L'ora corrente"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "una data specifica"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "una data relativa a quellla corrente"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Confronta con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "adesso"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<clicca qui per selezionare una data>"
 
@@ -5334,8 +6139,8 @@ msgstr ""
 "Oops, ti sei dimenticato di scegliere una cartella.\n"
 "Tornare indietro e specificare una cartella valida per consegnarvi la posta."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
@@ -5356,38 +6161,59 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:627
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nome della Regola:"
 
-#: filter/filter-rule.c:631
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se qualche criterio � soddisfatto"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "incoming"
+msgstr "In entrata:"
+
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "outgoing"
+msgstr "In uscita:"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Aggiungi"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Modifica"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
@@ -5429,7 +6255,8 @@ msgid "with all local folders"
 msgstr "con tutte le cartelle locali"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Assegna Colore"
 
 #: filter/libfilter-i18n.h:4
@@ -5505,90 +6332,91 @@ msgid "Expression"
 msgstr "Espressione"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Inoltra all'Indirizzo"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "� maggiore di"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "� minore di"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Il messaggio � stato ricevuto"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Il messaggio � stato inviato"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "alle o dopo"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "Alle o prima"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1054
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Imposta _Status"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Dimensione"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "Assomiglia a"
@@ -5610,7 +6438,8 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1055
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -5622,162 +6451,313 @@ msgstr "era dopo"
 msgid "was before"
 msgstr "era prima"
 
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Ruolo"
+
+#: filter/rule-editor.c:240
+#, fuzzy
+msgid "Add Rule"
+msgstr "Aggiungi una regola di Filtro"
+
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Modifica Interamente"
+
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Regole di punteggio"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importa"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Email"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Email"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Aggiungi rubrica"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Impostazioni..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: 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:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Email principale"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Componente di Evolution per gestire la posta."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Compositore della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Componente dell'indice esecutivo della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Componente di Evolution per visualizzare le cartelle di posta."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Fabbrica per il componente delle cartelle di posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Fabbrica per il compositore di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fabbrica per il componente della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Fabbrica per il componente del Sommario della Posta"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configurazione della Posta"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propriet�"
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modifica le propriet� del file"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:211
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet� per \"%s\""
 
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "Propriet�"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Impossibile creare una directory temporanea: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Archivia la ricerca come Cartella Virtuale"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr "Cartella Virtuale per Oggetto"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
+msgstr "Cartella Virtuale per _Oggetto"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Cartella Virtuale per Mittente"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "Cartella virtuale sul _Mittente"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Cartella Virtuale per Destinatari"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Cartella virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "secondo"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Salva con nome..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "_Salva con nome..."
+
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "S_tampa"
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Rispondi a Tutti"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Inoltra"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Vai avanti"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Inoltra"
+
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr "Segna come _Letto"
+
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "Segna come Letto"
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "Sposta nella Cartella..."
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Copia nella Cartella..."
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copia nella cartella..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Ripristina"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "_Ripristina"
+
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Aggiungi rubrica"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Crea Regola dal Messaggio"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtra sulla Mailng List"
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr "Cartella virtuale sulla Mailng List"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Componente di Evolution per gestire la posta."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Compositore della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Componente dell'indice esecutivo della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Componente di Evolution per visualizzare le cartelle di posta."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Fabbrica per il componente delle cartelle di posta di Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import mbox into Evolution"
+msgstr "Fabbrica per importare i file GnomeCard in Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabbrica per il compositore di Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports mbox files into Evolution"
+msgstr "Importa i file GnomeCard in Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabbrica per il componente della posta di Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Fabbrica per importare i file GnomeCard in Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Fabbrica per il componente del Sommario della Posta"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Importa i file GnomeCard in Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5813,41 +6793,73 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: 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 ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor degli Account di Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr "Editor degli Account di Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "File con la firma:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Questo messaggio non � stato inviato\n"
+"\n"
+"Salvare le modifiche?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr "(predefinito)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 #, fuzzy
 msgid "Disable"
 msgstr "Disabilita."
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Ripristina"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Imposta come mio account predefinito"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Gestione degli Account di Evolution"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "Editor degli Account di Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5868,11 +6880,11 @@ msgstr "Mail da %s"
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5884,7 +6896,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5892,7 +6904,7 @@ msgstr ""
 "� necessario configurare un' identit�\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5900,11 +6912,11 @@ msgstr ""
 "� necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Non � stato impostato un sistema di trasporto per la posta"
 
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5912,33 +6924,46 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:309
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:352
+#: mail/mail-callbacks.c:410
 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:592
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
 msgstr "Su %s, %s ha scritto:\n"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Messaggio inoltrato:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:1147
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5946,7 +6971,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1179
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -5955,27 +6980,25 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1212 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Sovrascrivere il file?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: mail/mail-callbacks.c:1216 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Esiste gi� un file con questo nome.\n"
-"Sovrascriverlo?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Il messaggio � stato ricevuto"
 
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:1262
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:1376
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5984,15 +7007,60 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1425 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtri..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:1472
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Sicuro di voler cancellare questo aaccount delle news?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Guida agli Account di Evolution"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -6006,37 +7074,67 @@ msgid " color"
 msgstr "Colori"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Tipo on supportato"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Allegato"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Tipo di Autenticazione:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "Controlla la posta automaticamente ogni"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Scrivi"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6052,178 +7150,293 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Bozza"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Creazione nuova cartella"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Modifica"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome e cognome:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "File con la firma:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_In linea"
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato della Mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Imposta come mio account predefinito"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Segna i messaggi come \"Letti\" dopo:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizzazione:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Percorso binario di PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Prendi un colore"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Impossibile inviare il messaggio: senza destinatari."
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Citato"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Ricezione"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Informazioni Utente"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Sicurezza"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Invia la posta in formato HTML come predefinito."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Visto"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Messaggio del Calendario"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo di Server:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Il Server richiede l'autenticazione"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Sorgenti"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Nessuna informazione"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Cartelle Virtuali"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "File di mailbox standard per Unix"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Username:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6233,203 +7446,243 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Modifica"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "secondi."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Impossibile connettersi al server POP su %s"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Impossibile connettersi al server POP su %s"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Impossibile creare la finestra di composizione."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
 msgstr ""
+"Impossibile creare la directory %s:\n"
+"%s"
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Guida agli Account di Evolution"
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Impossibile creare la finestra di composizione."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Impossibile creare la finestra di composizione."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Impossibile creare una directory temporanea: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Apri in %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualizzatore Esterno"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Apri in %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizzatore Esterno"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Caricamento del contenuto del messaggio"
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "_Contatto"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "_Obiettivo"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_Contatto"
+msgid "Save Image as..."
+msgstr "Salva come..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d secondi"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
 
-#: mail/mail-format.c:522
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
 
 #: mail/mail-format.c:746
-msgid "Loading message content"
-msgstr "Caricamento del contenuto del messaggio"
+msgid "Date"
+msgstr "Data"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Indirizzo Email:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Da"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Rispondi-a:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "A"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/mail-format.c:1055
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
 
-#: mail/mail-format.c:1061
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Messaggio cifrato"
 
-#: mail/mail-format.c:1062
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1152 mail/mail-format.c:1540
+#: mail/mail-format.c:1377
 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:1160 mail/mail-format.c:1548
+#: mail/mail-format.c:1388
 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:1761
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:2060
 #, 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:1777
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:1811
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntatore al sito FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Non � presente la cartella %s"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Apertura di '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Riconfigura Cartella"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Chiusura cartella corrente"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Rinomina vecchia cartella e apertura in corso"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creazione nuova cartella"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copia messaggi"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6438,7 +7691,7 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6446,7 +7699,16 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configura %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6455,7 +7717,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6464,43 +7726,30 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Sto lavorando"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "Accetti?"
-
-#: mail/mail-mt.c:874
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution progress"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr "Invio messaggio"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio messaggio"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
@@ -6514,56 +7763,68 @@ msgstr "Sposta messaggii in %s"
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Cestino"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Apertura cartella %s"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Apertura archivio %s"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Apertura cartella %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Riconfigura Cartella"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Scaricamento messaggi"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Salvataggio messaggi"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6572,12 +7833,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvare messaggio %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6586,11 +7842,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6599,198 +7855,196 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Cerca"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Senza nome)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Messaggi Multipli"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Stampa Messaggio"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Stampa Messaggio"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Inoltra"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Trova"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Percorso:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Invia e Ricevi la posta"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Ricezione"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "In Attesa..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Invio"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "E` stato scritto un messaggio incompleto nella pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Impossibile creare una mbox temporanea `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (messagio inoltrato)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (nessun oggetto)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Messaggio inoltrato - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Messaggio inoltrato (senza oggetto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Messagio Inoltrato-----<br><b>Da:</b> %s<br><b>A:</b> \"\n"
-"\"%s<br><b>Oggetto:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Messaggio inoltrato"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
-msgid "Reply"
-msgstr "Rispondi"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
-msgid "Reply to the sender of this message"
-msgstr "Rispondi all'autore di questo messaggio"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
-msgid "Reply to all recipients of this message"
-msgstr "Rispondi a tutti i destinatari di questo messaggio"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Inoltra questo messaggio"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
-msgid "Print the selected message"
-msgstr "Stampa il messaggio selezionato"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Elimina questo messaggio"
-
-#: mail/message-list.c:650
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Il pi� basso"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Pi� basso"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Pi� alto"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Il pi� alto"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:952
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Salvataggio messaggi"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Con la bandierina"
 
-#: mail/message-list.c:1055
-msgid "From"
-msgstr "Da"
-
-#: mail/message-list.c:1055
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1055
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Ricevuto"
 
-#: mail/message-list.c:1056
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1056
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Dimensione"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartella"
 
@@ -6818,148 +8072,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestione _Sottoscrizioni..."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome della cartella:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Componente di Evolution per il sommario esecutivo."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Tipo di cartella:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Fabbrica per il componente del sommario esecutivo di Evolution"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Specificare dove creare la cartella:"
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Appuntamento"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Mostra appuntamenti"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Niente indice"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
-"Scegliere il file che si vuole importare in Evolution, e selezionare che "
-"tipo di file sia dalla lista.\n"
-"\n"
-"Si pu� selezionare \"Automatico\" se non si conosce, Evolution tenter� di "
-"arrangiarsi."
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
-"Importazione di %s\n"
-"Importatore non pronto.\n"
-"Attendere 5 secondi per riprovare."
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
-"Importazione %s\n"
-"Importazione dell'oggetto %d."
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
-"Non c'� un importatore adatto a gestire\n"
-"%s"
 
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importazione"
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Installazione di Evolution"
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Si � verificato un errore nel caricare il file del calendario."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Errore nel caricare il calendario</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
-"Importazione di %s.\n"
-"Avvio di %s"
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "Errore nel caricare: %s"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Errore nel caricare: %s"
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sezioni:"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Stampa Messaggio non riuscita"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Annulla"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
-"Importazione %s\n"
-"Importazione dell'oggetto 1."
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatico"
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nome del file:"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Scegliere un file"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tipo di file:"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importa"
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Disabilita."
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Note"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
-"Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Utilit� Inportazione di Evolution"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_te:"
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Utilit� Importatore di Evolution"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Esistente"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Sorgenti"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mese"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Il pi� basso"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Il pi� basso"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Descrizione:"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Cerca ancora"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "adesso"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Aggiorna adesso"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Descrizione:"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Email"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
 msgstr ""
-"Utilit� di Importazione di Evolution, benvenuti.\n"
-"Questa guida vi accompagner� attraverso il processo \n"
-"di importazione di file esterni in Evoution."
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Email principale"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Ricezione Email"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Errore sconosciuto"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Inviti alla riunione"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Sig.na"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Verticale"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Mailing list"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Chiudi questa finestra"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Punteggio"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Chiudi questa finestra"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Invia"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Intestazione"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "giorni"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Risposto"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Cartelle"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Tutti i partecipanti"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Visualizza le cartelle a partire da:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Visualizza opzioni"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Visualizza"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Venerd�"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Mercoled�"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mese"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 settimana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Organizza\n"
+"Tempo"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "con tutte le cartelle remote attive"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Obiettivi"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+" Unit�:"
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Altro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Annulla la Selezione"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Aprile"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "La shell di Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Dettagli"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Annulla Riunione"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Cartelle Virtuali"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Installazione di Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6967,27 +9529,23 @@ msgstr ""
 "Questa nuova versione di Evolution richiede l'installazione di file \n"
 "addizionali nella directory personale di Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 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:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Impossibile aggiornare i file correttamente"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "File di Evolution installati con successo."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Sembra che si stia usando Evolution per la prima volta. "
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Cliccare \"OK\" per installare i files di utente di Evolution sotto"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6998,16 +9556,14 @@ msgstr ""
 "%s\n"
 "Errore: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Impossibile copiare i file in\n"
-"`%s'"
+msgstr "Si � verificato un errore durante le lettura del file."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7018,7 +9574,16 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7029,7 +9594,58 @@ msgstr ""
 "directorydi Evolution. Spostarla per permettere \n"
 "l'installazione dei file utente di Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Impossibile copiare i file in\n"
+"`%s'"
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copia nella Cartella"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Sposta nella Cartella..."
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Elimina questo obiettivo"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Apertura cartella %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7038,15 +9654,15 @@ msgstr ""
 "Impossibile creare la cartella specificata:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Il nome specificato della cartella non � valido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea nuova cartella"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7054,27 +9670,133 @@ msgstr ""
 "Il tipo di cartella selezionata non � valido\n"
 "per l'operazione richiesta. "
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nuovo..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Scegliere il file che si vuole importare in Evolution, e selezionare che "
+"tipo di file sia dalla lista.\n"
+"\n"
+"Si pu� selezionare \"Automatico\" se non si conosce, Evolution tenter� di "
+"arrangiarsi."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importazione di %s\n"
+"Importatore non pronto.\n"
+"Attendere 5 secondi per riprovare."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importazione %s\n"
+"Importazione dell'oggetto %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Non c'� un importatore adatto a gestire\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importazione"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importazione di %s.\n"
+"Avvio di %s"
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Errore nel caricare: %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Errore nel caricare: %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importazione %s\n"
+"Importazione dell'oggetto 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automatico"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nome del file:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Scegliere un file"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tipo di file:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Scegli Cartella"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non pu� essere eseguito."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7084,30 +9806,71 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crea un nuovo gruppo di collegamento"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Non collegato"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "Non collegato"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1184
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s -Evolution %s"
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7116,15 +9879,15 @@ msgstr ""
 "Ooops! La visualizzazione di `%s' � morta inaspettatamente. :-(\\n\n"
 "Il che significa che probabilmente il componente %s si � impallato"
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento "
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome del Gruppo:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7133,144 +9896,269 @@ msgstr ""
 "Si desidera veramente rimuovere il gruppo\n"
 "`%s' dalla barra dei collegamenti?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Rimuovi Questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Rimuovi Questo Gruppo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Nascondi la Barra di Collegamento"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Nasconde la barra di collegamento"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Attiva"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Attiva questo collegamento"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Apri"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Invia il messaggio adesso"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome della Regola:"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Visualizza"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Barra di Collegamento"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Mostra la cartella selezionata"
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contatti"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Senza nome)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Cartella non trovata"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Tipo on supportato"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "La shell di Evolution."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/main.c:83
-#, no-c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_leta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Qualunque campo contiene"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Host:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome della cartella:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Tipo di cartella:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Specificare dove creare la cartella:"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+"Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Utilit� Inportazione di Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Utilit� Importatore di Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Utilit� di Importazione di Evolution, benvenuti.\n"
+"Questa guida vi accompagner� attraverso il processo \n"
+"di importazione di file esterni in Evoution."
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importa"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Non rimuovere"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Non mostrare questo messagio in futuro."
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7294,7 +10182,7 @@ msgstr ""
 "Ci auguriamo che apprezziate il risultato del nostro duro lavoro, e\n"
 "aspettiamo ansiosamente i vostri contributi!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7302,247 +10190,324 @@ msgstr ""
 "Grazie\n"
 "il Team di Evolution.\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Impossibile inizializzare la shell di Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copia"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copia selezionato"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Cancella un contatto"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Trova"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Taglia"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Taglia selezionato"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Trova un contatto"
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Cancella un contatto"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "News"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Incolla"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Incolla agli appunti"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Stampa contatti"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Seleziona Tutto"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Cancella un contatto"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Visualizza Tutto"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Visualizza tutti i contatti"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Sorgenti della _Rubrica..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contatti"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Ceca Contatti"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Seleziona Tutto"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "S_trumenti"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Giorni"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Cambia preferenze"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crea un nuovo Evento dell'intera giornata"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crea un nuovo appuntamento"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crea un nuovo calendario"
+msgid "Create a new appointment"
+msgstr "Crea un nuovo appuntamento"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Giorno"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Vai al"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Torna indietro nel tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Vai avanti nel tempo"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Vai alla _Data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Vai a _Oggi"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Vai al presente"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mese"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Nuovo _Evento"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Successivo"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Apri calendario"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Prec"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nuovo Appuntamento"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Stampa calendario"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Stampa questo calendario"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Salva con Nome"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Informazioni Utente"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Salva calendario con altro nome"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Mostra 1 giorno"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Mostra 1 mese"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Mostra 1 settimana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
-msgstr "Oggi"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_Settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Settimana"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Appuntamento"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Impostazioni _Posta..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Giorno"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mese"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Nuovo"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr "_Settimana"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Apri calendario"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Chiudi"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Salva con nome..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Chiudi questo appuntamento"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
-msgstr "_Settimana"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Elimina questo appuntamento"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra dagli strimenti principale"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Anteprime del messaggio da stampare"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "_Anteprima di stampa"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Impostazione pagina"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Stampa questo articolo"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Stampa..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Salva ed Esci"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Cambia la vista con %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Imposta i parametri della pagina per la stampante corrente"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Azioni"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_File"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Elimina quest'oggetto"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Elimina..."
 
@@ -7554,27 +10519,12 @@ msgstr "Aiuto"
 msgid "Print En_velope..."
 msgstr "Stampa _Busta..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Stampa questo articolo"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Stampa..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Salva _come..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Salva ed Esci"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Salva il contatto e chiudi la finestra di dialogo"
@@ -7591,940 +10541,1011 @@ msgstr "Vedere aiuto in linea"
 msgid "Send _message to contact..."
 msgstr "Invia un _messaggio al contatto..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_File"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salva"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Informazioni su questa applicazione"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Informazioni su..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Salva l'impegno e chiudi la finestra di dialogo"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Azio_ni"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "_Invia contatto a altri..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "FIXME: Address _Book..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Invia un _messaggio al contatto..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Annulla"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Annulla Riunione"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_Taglia"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Controlla i Nomi"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Inoltra come v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Annulla"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Inoltra questo messaggio"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Annulla la Selezione"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Chiudi questo appuntamento"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Richiesta\n"
+"Riunione"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_ia nella Cartella..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Pianifica una _Riunione"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copia"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Pianifica una Riunione"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copia selezionato"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Azioni"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Taglia"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s -Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Taglia selezionato"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Annullato"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Elimina questo appuntamento"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Salva il file corrente"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Scrivi"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Fa un Dump della descrizione UI Xml"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Scrivi un nuovo messaggio"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimo oggetto della cartella"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Editor dei Contatti"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Inoltra come v_Calendar"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Vai al successivo"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Vuota _Cestino"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Vai al precedente"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Dimantica _Password"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Obiettivo incompleto"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modifica le propriet� del file"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Gestione _Sottoscrizioni..."
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "S_uccessivo"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Incolla"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Incolla agli appunti"
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Invia e Ricevi"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Precedente"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Precedente"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "_Anteprima di stampa"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "_Impostazioni Stampa..."
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor delle Cartelle Virtuali..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Impostazione pagina"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtri..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Salva"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Invia _Messaggio"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Impostazioni _Posta..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Salva il file corrente"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Anteprima"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Pianifica una _Riunione"
+#: ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "_Invia e Ricevi"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Pianifica un tipo di riunione"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleziona Tutto"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleziona ogni cosa"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Imposta i parametri della pagina per la stampante corrente"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Nascondi i Messaggi _Selezionati"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Richiesta _obiettivo"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Nascondi i Messaggi _Cancellati"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Nascondi i messaggi _Letti"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Informazioni su"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Chiudi"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Segna _Tutti come Letti"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contatto"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copia"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Incolla agli appunti"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Debug"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Aiuto"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleziona _Tutto"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Oggetto"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Seleziona _Thread"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Voce dell'agenda"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Ultimo oggetto della Cartella"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Invia messaggio"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Sposta nella Cartella..."
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Mostra _Tutto"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Incolla"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "S_tampa"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "LIsta di Messaggi a Thread"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Elimina per sempre"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Cartelle"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverti Selezione"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Propriet�"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleziona Tutto"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Obiettivo"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "LIsta di Messaggi a Thread"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Non letto"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Aggiungi Servizio"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Rispondi a tutti i destinatari di questo messaggio"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Aggiungi un servizio al Sommario Esecutivo"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crea una nuova email"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Rispondi all'autore di questo messaggio"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Impostazioni Sommario Esecutivo..."
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copia messaggio in una nuova cartella"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nuovi Messaggi"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Scrivi"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Scrivi un nuovo messaggio"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "Sposta nella Cartella..."
-
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copia messaggio in una nuova cartella"
+msgid "Create a virtual folder for these recipients"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "Copia messaggio in una nuova cartella"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this mailing list"
 msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Delete the selected messages"
-msgstr "Stampa il messaggio selezionato"
+msgid "Create a virtual folder for this sender"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Visualizza tutti gli header del messaggio"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
-msgid "Edit Message"
-msgstr "Stampa Messaggio"
+msgid "Display the next important message"
+msgstr "Rispondi all'autore di questo messaggio"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Edit the current message"
+msgid "Display the next message"
 msgstr "L'ora corrente"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Vuota _Cestino"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Expunge"
-msgstr "_Elimina per sempre"
+msgid "Display the previous message"
+msgstr "Elimina questo messaggio"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Filter on Mailing _List"
+msgid "Filter on Mailing _List..."
 msgstr "Filtra sulla Mailng List"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtro sul _Mittente"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtro sui _Destinatari"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtra sull'_Oggetto"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Dimantica _Password"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Inoltra"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Inoltra come"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Headers completi"
-
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Nascondi i Messaggi _Cancellati"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Hide S_elected Messages"
-msgstr "Nascondi i Messaggi _Selezionati"
+msgid "Forward _Attached"
+msgstr "Inoltra come"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Deleted Messages"
-msgstr "Nascondi i Messaggi _Cancellati"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Vai avanti"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide _Read messages"
-msgstr "Nascondi i messaggi _Letti"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Inoltra come"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Invert Selection"
-msgstr "_Inverti Selezione"
+msgid "Forward the selected message in the body of a new message"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Manage _Subscriptions..."
-msgstr "Gestione _Sottoscrizioni..."
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
-msgstr "Segna come _Letto"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark All as R_ead"
-msgstr "Segna _Tutti come Letti"
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Mark As Read"
-msgstr "Segna come Letto"
+msgid "Load _Images"
+msgstr "Messaggio inoltrato"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "Segna come _Non Letto"
+msgid "Mark as I_mportant"
+msgstr "Importante"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "Segna come _Non Letto"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Segna come Non Letto"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Sposta"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "Sposta il messaggio in una nuova cartella"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Successivo"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Important Message"
+msgstr "Rispondi all'autore di questo messaggio"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Messaggio"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleziona _Thread"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Messaggi Multipli"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Invia il messaggio adesso"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "Anteprima di stampa"
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "Stampa messaggio con la stampante"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Precedente"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Print message..."
+msgid "Previous Important Message"
 msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "Rispondi a _Tutti"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to all"
-msgstr "Rispondi a Tutti"
+msgid "Previous Unread Message"
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Reply to sender"
-msgstr "Rispondi al Mittente"
+msgid "Print Message..."
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "S_orgente"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Anteprima di stampa"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "Salva il messaggio in una cartella specificata"
+msgid "Print this message"
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleziona _Tutto"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Rispondi"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "Seleziona _Thread"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Rispondi a Tutti"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Send / Receive"
-msgstr "Invia e Ricevi"
+msgid "S_earch Message"
+msgstr "Salva Messaggio con nome..."
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Salva il messaggio in una cartella specificata"
+
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
+msgid "Show Full _Headers"
+msgstr "_Headers completi"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr ""
+"La data deve essere inserita nel formato:\n"
+"\n"
+"%s"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "Mostra _Tutto"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Copia messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "LIsta di Messaggi a Thread"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Allegare un file al messaggio"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
-msgid "VFolder on Mailing _List"
+msgid "VFolder on Mailing _List..."
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "Cartella virtuale sul _Mittente"
 
-#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
 msgstr "Cartella Virtuale per _Oggetto"
 
-#: ui/evolution-mail.xml.h:87
-msgid "View Raw Message Source"
-msgstr "Vedi la sorgente grezza del messaggio"
-
-#: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor delle Cartelle Virtuali..."
-
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Applica Filtri"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Allegato"
-
-#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "_Copia nella cartella..."
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copia nella Cartella"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crea Filtro dal Messaggio"
 
-#: ui/evolution-mail.xml.h:94
-msgid "_Expunge"
-msgstr "_Elimina per sempre"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Filters..."
-msgstr "_Filtri..."
-
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Cartelle"
-
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "_Inoltra"
-
-#: ui/evolution-mail.xml.h:98
-msgid "_Inline"
-msgstr "_In linea"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverti Selezione"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Mail Message"
-msgstr "Invia _Messaggio"
-
-#: ui/evolution-mail.xml.h:101
-msgid "_Mail Settings..."
-msgstr "Impostazioni _Posta..."
-
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "_Sposta nella Cartella..."
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Messaggio inoltrato"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "_Apri i Selezionati"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Messaggio"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Quoted"
-msgstr "_Citato"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Sposta nella Cartella..."
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "_Rispondi"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Visualizza"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Resend Messages"
+msgid "_Open Message"
 msgstr "Messaggio del Calendario"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Salva Messaggio con nome..."
+msgid "_Re-send Message"
+msgstr "Messaggio del Calendario"
 
-#: ui/evolution-mail.xml.h:110
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "_Invia e Ricevi"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Chiudi questa finestra"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "A _Thread"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zza barre degli strumenti..."
 
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "_Ripristina"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizza"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizza barre degli strumenti"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Chiudi"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Visualizza"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Allega"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Chiudi il file corrente"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Elimina tutte le Ricorrenze"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Cifra Messaggio con PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormato"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserici un file di testo..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserici un file come testo nel messaggio"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserici un file di testo..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Apri un file"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Cifra con PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Firma con PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Salva _Bozza"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Cifra con PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salva nella cartella..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Salva"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Salva con Nome"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Salva _Bozza"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Salva il file corrente"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Salva il file corrente con un nome diverso"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Invia"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Invia pi� _Tardi"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Invia pi� _tardi"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Invia il messaggio pi� tardi"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Invia il messaggio adesso"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Invia questo messaggio adesso"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Mostra / nascondi allegati"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostra _allegati"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Mostra allegati"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Frima questo messaggio con la chiave PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Frima questo messaggio con la chiave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Mostra/nasconde il campo BCC"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Mostra/nasconde il campo CC"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Mostra/nasconde il campo di selezione Da"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Mostra/nasconde il campo Rispondi A"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Allegato"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Elimina"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _Da"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "Inserisci un file di testo..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Sicurezza"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Aiuto"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "C_artelle"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Aggiorna Lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Aggiorna la Lista delle Cartelle"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Iscrizione"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Annulla iscrizione"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Asseg_na obiettivo"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Cerca ancora"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Richiesta _appuntamento"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Rifai"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Rifai l'azione annullata"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Sostituisci una stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Rispondi a _Tutti"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "_Invia un report"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "_Salta ricorrenza"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Salva l'impegno e chiudi la finestra di dialogo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Cerca ancora la stessa stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Cerca una stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Annulla"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nuovo Obiettivo"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Elimina questo obiettivo"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Appuntamento"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Aggiorna Lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Segna come Completato"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Rispondi"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_Apri i Selezionati"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crea un nuovo obiettivo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Elimina questo obiettivo"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Elimina questo obiettivo"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nuovo Obiettivo"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Incolla agli appunti"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Salva obiettivo come qualcos'altro"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferenze degli Obiettivi..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Impostazioni _Posta..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Obiettivo"
 
@@ -8532,242 +11553,363 @@ msgstr "_Obiettivo"
 msgid "About Evolution..."
 msgstr "Informazioni su Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zza barre degli strumenti..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Barra di Collegamento"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizza"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Cambia la vista con %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizza barre degli strumenti"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copia nella Cartella"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creazione nuova cartella"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creazione nuova cartella"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Elimina quest'oggetto"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visualizza un'altra cartella"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "E_sci"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
 #, fuzzy
-msgid "Evolution _Window"
+msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "_Barra del Collegamenti di Evolution"
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Primi _Passi"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importa un formato di file esterno"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra dagli strimenti principale"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
+msgstr ""
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Invia il messaggio adesso"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Mostra informazioni su Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Inoltra un Bug Report usando Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Ruolo"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nasconde la barra delle cartelle"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nasconde la barra dei collegamenti"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Mostra/nasconde il campo di selezione Da"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uso del manger dei C_ontatti"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uso del _Calendario"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uso del programma di _Posta"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Non collegato"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Informazioni su Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Azioni"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Appuntamento"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contatto"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copia"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Vai alla cartella..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importa un file..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indice"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Invia messaggio"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Sposta"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nuovo"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Apri..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Barra di Collegamento"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Barra di Collegamento"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Obiettivo"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Non collegato"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Impostazioni _Posta..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "biglietto da visita"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Ditta"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipi di Telefono"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Mittente"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "Status"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Oggetto"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Messaggio"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Categoria:"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr "Tentativo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Occupato"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Assente"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invita altri..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Mostra s_olo le ore lavorative"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Vista _allargata"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "A_ggiorna libero/Occupato"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Tutto il Personale e le Risorse"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Tutto il _Personale e una Risorsa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Personale _Richiesto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Personale Richiesto e _una risorsa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "_Inizio appuntamento ore:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Tutti i partecipanti"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Vista _Corrente"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Adesso"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Oggi"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8775,21 +11917,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "settimana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Cestino"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Transazione fallita"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "News"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Errore sconosciuto: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Altro"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor dei Contatti"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Ricerca Avanzata"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "Avanzato ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Mostra Tutto"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzato..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8799,6 +12028,10 @@ msgstr "Informazione"
 msgid "Warning"
 msgstr "Avviso"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Errore"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Domanda"
@@ -8812,67 +12045,692 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_Cerca"
 
-#: views/addressbook/galview.xml.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr "Server Personale della Rubrica"
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr "Server personale del Calendario; fabbrica del calendario"
+
+#: wombat/wombat.c:173
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
+
+#: wombat/wombat.c:185
+msgid "init_corba(): could not initialize GNOME"
+msgstr "init_corba(): impossibile inizializzare GNOME"
+
+#: wombat/wombat.c:198
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+
 #, fuzzy
-msgid "Adress Cards"
-msgstr "biglietto da visita"
+#~ msgid "Set task view preferences"
+#~ msgstr "Cambia preferenze"
 
-#: views/addressbook/galview.xml.h:2
 #, fuzzy
-msgid "By Company"
-msgstr "Ditta"
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferenze degli Obiettivi..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontatti..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Compagnia:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Come _Minicards"
+
+#~ msgid "As _Table"
+#~ msgstr "Come _Tabella"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Impossibile aprire questa rubruca.  Questo significa che \n"
+#~ "� stata inserita una URI non corretta, oppure che si �\n"
+#~ "cercato di accedere a un server LDAP senza avere il supporto \n"
+#~ "LDAP compilato.  Se si � inserita una URI, controllarne \n"
+#~ "la correttezza ed inserirla nuovamente.  Altrimenti, � \n"
+#~ "probabile che si sia cercato di accedere ad un server LDAP. \n"
+#~ "Se si desidera usare LDAP, � necessario scaricare e \n"
+#~ "installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Trova..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Open calendar"
+#~ msgstr "Apri calendario"
+
+#~ msgid "Save calendar"
+#~ msgstr "Salva calendario"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Errore nel caricare il calendario:<br>Metodo non supportato"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Interruzione avviso sonoro dopo"
+
+#~ msgid "Colors"
+#~ msgstr "Colori"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Attiva la suoneria per "
+
+#~ msgid "Highlight"
+#~ msgstr "Evidenzia"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Scadenze per oggi:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Non ancora scaduti"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Non ancora scaduti:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Compiti scaduti:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaskPad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Cronometra fino al termine"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Avviso visivo"
+
+#~ msgid "Work week"
+#~ msgstr "Settimana lavorativa"
+
+#~ msgid "Edit Task"
+#~ msgstr "Modifica Obiettivo"
+
+#~ msgid "Percent complete"
+#~ msgstr "Percentuale completata"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Segna l'obiettivo come raggiunto"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Modifica questo obiettivo..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Modifica obiettivo"
+
+#~ msgid "Go to Today"
+#~ msgstr "Vai a Oggi"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Compnente aggiornata con successo."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Impossibile caricare il file del calendario!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Impossibile leggere il file del calendario!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Questa � la risposta di qualcuno che non era stato invitato!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Impossibile aggiornare l'archivio del calendario."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Impossibile cancellare il componente del calendario!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Componente aggiornato con successo."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Tipo di componente del calendario non riconosciuto."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Aggiungi al Calendario"
 
-#: views/addressbook/galview.xml.h:3
 #, fuzzy
-msgid "Phone List"
-msgstr "Tipi di Telefono"
+#~ msgid " Tentative "
+#~ msgstr "Tentativo"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Aggiorna Calendario"
+
+#~ msgid "Attendee address"
+#~ msgstr "Indirizzo del partecipante"
+
+#~ msgid "Attendees: "
+#~ msgstr "Partecipanti:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Annulla \n"
+#~ "Riunione"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizzatore: "
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Pubblica\n"
+#~ "Evento"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Appuntamenti di Base:"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Mostra un dialogo"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data di _inizio:"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
 
-#: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "By Sender"
-msgstr "Mittente"
+#~ msgid "Summary contains"
+#~ msgstr "Email contiene"
 
-#: views/mail/galview.xml.h:2
 #, fuzzy
-msgid "By Status"
-msgstr "Status"
+#~ msgid "Comment contains"
+#~ msgstr "Il nome contiene"
 
-#: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Subject"
-msgstr "Oggetto"
+#~ msgid "Has category"
+#~ msgstr "Categoria:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Impossibile verificare il file di blocco per %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Scansione delle cartelle IMAP in corso"
 
-#: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "Messages"
-msgstr "Messaggio"
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Mostra la cartella selezionata"
+
+#~ msgid "Inline attachment"
+#~ msgstr "allegato inlinea"
+
+#~ msgid "Send as:"
+#~ msgstr "Invia come :"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile aprire il file firma: %s\n"
+#~ "%s "
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Non � un file regolare."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "File esistente ma illeggibile."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Questo file � molto grande (pi� di 100K).\n"
+#~ "Inserire ugualmente?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "� possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
+#~ "Esecutivo.\n"
+#~ "\n"
+#~ "Lasciare in bianco per la pagina predefinita. "
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Apre %s con l'applicazione di GNOME predefinita"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Apre %s con il browser di GNOME predefinito"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Invia un email a %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Esegui %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Chiudi %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Sposta %s a sinistra"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Sposta %s a destra"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Sposta %s alla riga precedente"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Sposta %s alla riga successiva"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile aprire il file HTML:\n"
+#~ "%s "
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Il file non ha un posto per i servizi.\n"
+
+#~ msgid "Appearance"
+#~ msgstr "Aspetto"
+
+#~ msgid "Background:"
+#~ msgstr "Sfondo:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "Il componente del sommario esecutivo non riesce a inizializzare Bonobo.\n"
+#~ "Nel caso ci sia un messaggio circa il RootPOA, probabilmente significa che\n"
+#~ "Bonobo � stato compilato con GOAD invece che con OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fabbrica per il sommario RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Indice RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fabbrica per il componente di prova di bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Fabbrica per il componente di prova."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Prova servizio bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Prova servizio"
+
+#~ msgid "Update automatically"
+#~ msgstr "Aggiorna automaticamente"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Inoltra all'Indirizzo"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "Cartella Virtuale per Oggetto"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Cartella Virtuale per Mittente"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Cartella Virtuale per Destinatari"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Segna come Letto"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Sposta nella Cartella..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copia nella Cartella..."
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Chiusura cartella corrente"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Rinomina vecchia cartella e apertura in corso"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copia messaggi"
+
+#~ msgid "Do you accept?"
+#~ msgstr "Accetti?"
 
-#: views/tasks/galview.xml.h:2
 #, fuzzy
-msgid "With Category"
-msgstr "Categoria:"
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution progress"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Server Personale della Rubrica"
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Server personale del Calendario; fabbrica del calendario"
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: wombat/wombat.c:173
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "E` stato scritto un messaggio incompleto nella pipe!"
 
-#: wombat/wombat.c:185
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): impossibile inizializzare GNOME"
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (messagio inoltrato)"
 
-#: wombat/wombat.c:198
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (nessun oggetto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Messaggio inoltrato (senza oggetto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Messagio Inoltrato-----<br><b>Da:</b> %s<br><b>A:</b> \"\n"
+#~ "\"%s<br><b>Oggetto:</b> %s<br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Stampa il messaggio selezionato"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "File di Evolution installati con successo."
+
+#~ msgid "Activate"
+#~ msgstr "Attiva"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Attiva questo collegamento"
+
+#~ msgid "Find a contact"
+#~ msgstr "Trova un contatto"
+
+#~ msgid "View All"
+#~ msgstr "Visualizza Tutto"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualizza tutti i contatti"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Giorni"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crea un nuovo calendario"
+
+#~ msgid "Day"
+#~ msgstr "Giorno"
+
+#~ msgid "New _Event"
+#~ msgstr "Nuovo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Apri calendario"
+
+#~ msgid "Prev"
+#~ msgstr "Prec"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Salva calendario con altro nome"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Apri calendario"
+
+#~ msgid "About this application"
+#~ msgstr "Informazioni su questa applicazione"
+
+#~ msgid "About..."
+#~ msgstr "Informazioni su..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Azio_ni"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "FIXME: Address _Book..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Annulla"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Controlla i Nomi"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_ia nella Cartella..."
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Fa un Dump della descrizione UI Xml"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimo oggetto della cartella"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Editor dei Contatti"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Vai al successivo"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Vai al precedente"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Obiettivo incompleto"
+
+#~ msgid "N_ext"
+#~ msgstr "S_uccessivo"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Precedente"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Impostazioni Stampa..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Pianifica un tipo di riunione"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleziona ogni cosa"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Richiesta _obiettivo"
+
+#~ msgid "_About..."
+#~ msgstr "_Informazioni su"
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Oggetto"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Voce dell'agenda"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Ultimo oggetto della Cartella"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Invia messaggio"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Sposta nella Cartella..."
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Note"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Non letto"
+
+#~ msgid "Add Service"
+#~ msgstr "Aggiungi Servizio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Aggiungi un servizio al Sommario Esecutivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crea una nuova email"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Impostazioni Sommario Esecutivo..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nuovi Messaggi"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "Sposta nella Cartella..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copia messaggio in una nuova cartella"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Elimina per sempre"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Nascondi i Messaggi _Cancellati"
+
+#, fuzzy
+#~ msgid "Invert Selection"
+#~ msgstr "_Inverti Selezione"
+
+#, fuzzy
+#~ msgid "Mark As Read"
+#~ msgstr "Segna come Letto"
+
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "Segna come _Non Letto"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Sposta il messaggio in una nuova cartella"
+
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "Anteprima di stampa"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Stampa messaggio con la stampante"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "Rispondi a Tutti"
+
+#, fuzzy
+#~ msgid "Reply to sender"
+#~ msgstr "Rispondi al Mittente"
+
+#~ msgid "S_ource"
+#~ msgstr "S_orgente"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Invia la posta in coda e ricevi quella nuova"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vedi la sorgente grezza del messaggio"
+
+#~ msgid "_Reply"
+#~ msgstr "_Rispondi"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Salva Messaggio con nome..."
+
+#~ msgid "_Threaded"
+#~ msgstr "A _Thread"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Salva nella cartella..."
+
+#~ msgid "Send the message now"
+#~ msgstr "Invia il messaggio adesso"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Inserisci un file di testo..."
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Asseg_na obiettivo"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Richiesta _appuntamento"
+
+#~ msgid "Redo"
+#~ msgstr "Rifai"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Rifai l'azione annullata"
+
+#~ msgid "Replace"
+#~ msgstr "Sostituisci"
+
+#~ msgid "Replace a string"
+#~ msgstr "Sostituisci una stringa"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Rispondi a _Tutti"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Invia un report"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "_Salta ricorrenza"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Cerca ancora la stessa stringa"
+
+#~ msgid "Search for a string"
+#~ msgstr "Cerca una stringa"
+
+#~ msgid "Undo"
+#~ msgstr "Annulla"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Annulla l'ultima azione"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Segna come Completato"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Rispondi"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Barra del Collegamenti di Evolution"
 
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzato ..."
diff --git a/po/ja.po b/po/ja.po
index e4ac4170ea..545858278b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-06-12 17:40+0900\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-06-12 19:52+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3324
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "̾��: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "̾��: "
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  �ɾ�(���Ĥ�):     "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,13 +49,13 @@ msgstr ""
 "\n"
 "  ��:      "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -55,7 +63,7 @@ msgstr ""
 "\n"
 "  �ե��ߥ꡼̾:     "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -63,7 +71,7 @@ msgstr ""
 "\n"
 "  �ɾ�(��Ĥ�):     "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +79,7 @@ msgstr ""
 "\n"
 "������: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +87,7 @@ msgstr ""
 "\n"
 "����:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,7 +95,7 @@ msgstr ""
 "\n"
 "͹���ֹ�:  "
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -95,25 +103,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -121,7 +129,7 @@ msgstr ""
 "\n"
 "  ͹���ֹ�: "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -129,13 +137,13 @@ msgstr ""
 "\n"
 "  ��:       "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -143,7 +151,7 @@ msgstr ""
 "\n"
 "�����ֹ�:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -151,7 +159,7 @@ msgstr ""
 "\n"
 "�����ֹ�:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -159,7 +167,7 @@ msgstr ""
 "\n"
 "�᡼��:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -167,7 +175,7 @@ msgstr ""
 "\n"
 "�᡼��:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -175,7 +183,7 @@ msgstr ""
 "\n"
 "�᡼��: "
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +191,7 @@ msgstr ""
 "\n"
 "�����ॾ����: "
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,7 +199,7 @@ msgstr ""
 "\n"
 "�а�: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -199,7 +207,7 @@ msgstr ""
 "\n"
 "�Ż��ο�̳: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -207,7 +215,7 @@ msgstr ""
 "\n"
 "�ȿ�: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -215,7 +223,7 @@ msgstr ""
 "\n"
 "  ��̾:  "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -223,7 +231,7 @@ msgstr ""
 "\n"
 "  ����:  "
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -231,7 +239,7 @@ msgstr ""
 "\n"
 "  ����2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -239,7 +247,7 @@ msgstr ""
 "\n"
 "  ����3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -247,7 +255,7 @@ msgstr ""
 "\n"
 "  ����4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -255,7 +263,7 @@ msgstr ""
 "\n"
 "��̳ʬ��: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -273,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -281,7 +289,7 @@ msgstr ""
 "\n"
 "Ǥ�դ�ʸ����: "
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -289,36 +297,24 @@ msgstr ""
 "\n"
 "������: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "ʣ���� VCard"
 
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "%s �� VCard"
 
-#: addressbook/backend/ebook/e-destination.c:244
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Evolution �� VCard �ե�����򥤥�ݡ��Ȥ���ե����ȥ�"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
 
@@ -331,14 +327,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook �ϥ����ɤ���Ƥ��ޤ���\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat �����Ф򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "wombat �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -348,729 +344,812 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "���ɥ쥹��ݥåץ��åפ��뤿��� Bonobo ����ȥ�����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "���ɥ쥹��ɽ�����뤿��� Bonobo ����ȥ�����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "���ɥ쥹Ģ��ɽ������ Bonobo ����ȥ�����Υ���ץ�Ǥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "���󥿥��Ȥ򰷤������ Evolution ����ݡ��ͥ��"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "���ɥ쥹Ģ�ߥ˥����ɥ���ȥ�����Τ���Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "���ɥ쥹Ģ�Υ��ɥ쥹ɽ���Τ���Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution ���ɥ쥹Ģ����ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP ������"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "�ե�����"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "̤�ΤΥ��ɥ쥹Ģ����"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "�ʤ� (ƿ̾�⡼��)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "�ѥ����"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "̤�Τ�ǧ�ڼ���"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "�١�������ȥ�"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "���֥���ȥ�"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "���٤ƤΥ���ȥ�"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "̤�ΤΥ������׼���"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "�����DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME �Х���� DN �Υإ�ץƥ����ȤǤ�"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "���Υѥ���ɤ򵭲�"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "�ۥ���:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME �ۥ��ȥإ�ץƥ����ȤǤ�"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "�롼�� DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME �롼�� DN �إ�ץƥ����ȤǤ�"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "�ݡ���:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME �ݡ��ȥإ�ץƥ����ȤǤ�"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "�����ϰ�:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "ǧ������:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "��� LDAP ���ץ����"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "�ѥ�:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME �ѥ��إ�ץƥ����ȤǤ�"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "¸�ߤ��ʤ����ѥ����������"
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "���ɥ쥹Ģ���Խ�"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "���ɥ쥹Ģ���ɲ�"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"���ʤ��λ��ĥ��ɥ쥹Ģ������, ����ˤĤ��Ƥδ�Ϣ������������Ϥ��Ƥ�������"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "̾��:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME ̾���إ�ץƥ����ȤǤ�"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME �����إ�ץƥ����ȤǤ�"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "�ɲ�"
+msgid "Addressbook Sources"
+msgstr "���ɥ쥹Ģ�Υ�����"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "���"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "̾��"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "�ɲ�(_A)"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "�Խ�(_E)"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "����¾�Υ��󥿥���"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s �Υѥ���ɤ����Ϥ��Ƥ�������"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
+
+#: addressbook/gui/component/addressbook.c:380
+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 ""
+"���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���. ����ϸ��ä�URI\n"
+"�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
+"���̣���ޤ�"
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"���� Evolution �ΥС������� LDAP ���ݡ��Ȥ򤻤��˥���ѥ���\n"
+"����Ƥ��ޤ�. Evolution �� LDAP ��Ȥ������ʤ��, �������\n"
+"���� OpenLDAP ����������� CVS ����������ץ�������\n"
+"����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
+"����äƤ��뤫�ɤ��������å����Ƥ�������"
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "̾�������Τ�Τ�ޤ�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "�᡼�뤬���Τ�Τ�ޤ�"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "̾�������Τ�Τ�ޤ�"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "�ե�����֥饦����ɽ������ URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "���פʥ᡼��"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "�᡼��2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "�᡼��3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "�ե����������"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "�������󥿥��Ȥ�������ޤ�"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "���ɥ쥹Ģ���Խ�"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "���󥿥��Ⱦ�����Խ�"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "���󥿥��Ȥ��ɲ�"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "�᡼�륢�ɥ쥹:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "�������̵��"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "�������ͭ�� (�����Ǥ�!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "���"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "���٤ƺ��"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTML �᡼����������ޤ���?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "�ѹ���Υ��󥿥���:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "��å������μ�����"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "̾��������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "������̾��������:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "���ƥ���:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "����(_S)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "��ǰ��(_v):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "�Ż�(_u)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "�Ż��� FAX(_F)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "���󥿥���(_o)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "���ƥ���(_t)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "���󥿥��ȥ��ǥ���"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:115
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "�ܺ�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "��̾:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "�������ü���"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "����(_t):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "�ȿ�:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "���ü���"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Primary Email"
-msgstr "���פʥ᡼��"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "HTML �᡼����������(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "�����֥ڡ����� URL:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
-msgid "_Add"
-msgstr "�ɲ�(_A)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "����(_A)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "����������Ȥ�̾��(_A):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "������(_B):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "�Ż�(_B)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "���(_C):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "���󥿥���(_C)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:725 mail/mail-config.glade.h:95
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:108
-#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "���(_D)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "����(_D):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "�ե�͡���(_F)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "��(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "�ޥ͡������̾��(_M):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "�����(_M)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "�˥å��͡���(_N):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "��̳��(_O):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "���翦(_P):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "�۶���(_S):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "�����͹��ʪ�ν���Ǥ�"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "���󥿥��Ȥ������ޤ���?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "���Υ��󥿥��ȤϤ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "�����������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/contact-editor/e-contact-editor.c:1309
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "�Ż�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "�Ż� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "�Ƥ��ᤷ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "���"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "�� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "�Ȥ� FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "�����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/contact-editor/e-contact-editor.c:1311
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "����¾"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "����¾�� FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "�ݥ��٥�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "�ץ饤�ޥ�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "�饸��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "�ƥ�å���"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Email 2"
-msgstr "�᡼��2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:725
-msgid "Email 3"
-msgstr "�᡼��3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "���󥿥��Ȥ������ޤ���?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:234
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "���󥿥��Ȥδʰ��ɲ�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:236
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "���٤��Խ�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:277
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "�ե�͡���"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "�᡼��"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "���� 2(_2):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "���ʥ�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "��������å�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "��(_y):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "�ե������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "����ꥫ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "����(_A):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "��(_C):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "���Ȣ(_P):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "͹���ֹ�(_Z):"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "�ե�͡���Υ����å�"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "̾(_F):"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "��(_L):"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "�ߥɥ�͡���(_M):"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "�ɾ�(��Ĥ�)(_S):"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "�ɾ�(���Ĥ�)(_T):"
 
-#: addressbook/gui/component/addressbook.c:341
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s �Υѥ���ɤ����Ϥ��Ƥ�������"
-
-#: addressbook/gui/component/addressbook.c:369
-msgid "Unable to open addressbook"
-msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
-
-#: addressbook/gui/component/addressbook.c:376
-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 ""
-"���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���. ����ϸ��ä�URI\n"
-"�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
-"���̣���ޤ�"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "�ե�����̾:"
 
-#: addressbook/gui/component/addressbook.c:381
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"���� Evolution �ΥС������� LDAP ���ݡ��Ȥ򤻤��˥���ѥ���\n"
-"����Ƥ��ޤ�. Evolution �� LDAP ��Ȥ������ʤ��, �������\n"
-"���� OpenLDAP ����������� CVS ����������ץ�������\n"
-"����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "12 ��"
 
-#: addressbook/gui/component/addressbook.c:389
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: 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 ""
-"���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
-"����äƤ��뤫�ɤ��������å����Ƥ�������"
-
-#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "Name contains"
-msgstr "̾�������Τ�Τ�ޤ�"
-
-#: addressbook/gui/component/addressbook.c:551
-msgid "Email contains"
-msgstr "�᡼�뤬���Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:697
-msgid "The URI that the Folder Browser will display"
-msgstr "�ե�����֥饦����ɽ������ URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP ������"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "�ե�����"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "̤�ΤΥ��ɥ쥹Ģ����"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "�ʤ� (ƿ̾�⡼��)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
-msgid "Password"
-msgstr "�ѥ����"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "̤�Τ�ǧ�ڼ���"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "�١�������ȥ�"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "���֥���ȥ�"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "���٤ƤΥ���ȥ�"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "̤�ΤΥ������׼���"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "�����DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME �Х���� DN �Υإ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:68
-msgid "Remember this password"
-msgstr "���Υѥ���ɤ򵭲�"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
-msgid "Host:"
-msgstr "�ۥ���:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME �ۥ��ȥإ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "�롼�� DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME �롼�� DN �إ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "�ݡ���:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME �ݡ��ȥإ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "�����ϰ�:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "ǧ������:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "��� LDAP ���ץ����"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
-msgid "Path:"
-msgstr "�ѥ�:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME �ѥ��إ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "¸�ߤ��ʤ����ѥ����������"
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "���ɥ쥹Ģ���Խ�"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "���ɥ쥹Ģ���ɲ�"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"���ʤ��λ��ĥ��ɥ쥹Ģ������, ����ˤĤ��Ƥδ�Ϣ������������Ϥ��Ƥ�������"
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
-msgid "Name:"
-msgstr "̾��:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME ̾���إ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME �����إ�ץƥ����ȤǤ�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "���ɥ쥹Ģ�Υ�����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-#: calendar/gui/e-meeting-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
-msgid "Delete"
-msgstr "���"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "�Խ�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "̾��"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "����¾�Υ��󥿥���"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "�������̵��"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "�������ͭ�� (�����Ǥ�!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:281
-msgid "Edit Contact Info"
-msgstr "���󥿥��Ⱦ�����Խ�"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:347
-msgid "Add to Contacts"
-msgstr "���󥿥��Ȥ��ɲ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "���ɥ쥹��ݥåץ��åפ��뤿��� Bonobo ����ȥ�����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "���ɥ쥹��ɽ�����뤿��� Bonobo ����ȥ�����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "���ɥ쥹Ģ��ɽ������ Bonobo ����ȥ�����Υ���ץ�Ǥ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "���󥿥��Ȥ򰷤������ Evolution ����ݡ��ͥ��"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "���ɥ쥹Ģ�ߥ˥����ɥ���ȥ�����Τ���Υե����ȥ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "���ɥ쥹Ģ�Υ��ɥ쥹ɽ���Τ���Υե����ȥ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution ���ɥ쥹Ģ����ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:161
-#: composer/e-msg-composer-attachment-bar.c:473 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "���"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:176
-msgid "Remove All"
-msgstr "���٤ƺ��"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Send HTML Mail?"
-msgstr "HTML �᡼����������ޤ���?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "����..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "��å������μ�����"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "̾��������"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "���󥿥��ȥ��ǥ���"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "������̾��������:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "���󥿥��ȥ��ǥ���"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "�Ȥˤ����ɲ�"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "��ʣ�������󥿥��Ȥ򸡽Ф��ޤ���"
 
@@ -1091,18 +1170,14 @@ msgstr ""
 "���Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "�Ȥˤ����ѹ�"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "�ѹ���Υ��󥿥���:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "���ͤ��Ƥ��륳�󥿥���:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1110,8 +1185,13 @@ msgstr ""
 "�ѹ��������Υ��󥿥��Ȥ�̾�����뤤�ϥ᡼�륢�ɥ쥹��\n"
 "���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "�Ȥˤ����ѹ�"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "����"
 
@@ -1225,165 +1305,241 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard ����¸"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "¾�إ��󥿥��Ȥ�����"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "���󥿥�����إ�å�����������"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:70 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "����"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "ɽ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+msgid "Error modifying card"
+msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "̤�ΤΥ��顼"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "���ե饤����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "���Ĥ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "�ե����뤬���Ĥ���ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "����󥻥뤷�ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O ���顼"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* ���󥿥��Ȥ��ɲä��뤿��ˤ����򥯥�å� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "��̾"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "�᡼��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "�Ż�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "�Ƥ��ᤷ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "��Ҥ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "�Ȥ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "�ȿ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "�Ż��ν���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "�Ȥν���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "�ֺ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "�Ż������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "�Ȥ����� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "����¾������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "����¾�ν���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "�����֥�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "��̳��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "���翦"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "�ޥ͡�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "�˥å��͡���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "�۶���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "��λ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-msgid "Error removing card"
-msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "�����ɤ�����..."
 
-#: addressbook/gui/widgets/e-minicard.c:436
-msgid "Error modifying card"
-msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "���ɥ쥹Ģ����¸"
@@ -1431,7 +1587,8 @@ msgid "Dimensions:"
 msgstr "��ˡ:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "�ե����..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1491,7 +1648,6 @@ msgid "Margins"
 msgstr "�ޡ�����"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "���:"
 
@@ -1571,39 +1727,64 @@ msgstr "����:"
 msgid "Width:"
 msgstr "��:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "�ե����..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "�����������Ф��̿���˥��顼��ȯ�����ޤ���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "��«�κ�¥"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "���顼�����"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution ������ iTip/iMip �ӥ塼��"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "�������򰷤������ Evolution ����ݡ��ͥ��"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution ����������ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution ����������ݡ��ͥ�ȤΤ���Υե����ȥ�"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1613,141 +1794,255 @@ msgstr "���顼�����Υ����ӥ�"
 msgid "Factory for the alarm notification service"
 msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "�Ĥ���"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "���顼�����"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "���顼����߻��� (ʬ)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "��«���Խ�"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "���ѤǤ��륵�ޥ꡼�Ϥ���ޤ���"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "��«�κ�¥"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "���顼�����"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOME �ν����������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo �ν����������ޤ���Ǥ���"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "�ե����뤬���Ĥ���ޤ���"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%Y/%B/%e %A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%b/%d (%a)"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%b/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "�������򳫤�"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "����������¸"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "��Ū"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "̤��"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:696
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "�⤤"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:695
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:694
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "�㤤"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Ʃ��"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "��Ʃ��"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1758,24 +2053,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "ʬ��� '����', '��Ū', '����' ���뤤�� '�ʤ�' �����򤷤ʤ���Фʤ�ޤ���"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
-#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:997
-#: mail/mail-accounts.c:123 mail/mail-accounts.c:174
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1394
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1785,227 +2084,257 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ���"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "̤���"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Ʃ���٤� 'Ʃ��', '��Ʃ��', ���뤤�� '�ʤ�' �Ǥʤ���Фʤ�ޤ���"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "��ȯ"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "������"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%Y/%B/%e %A"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "̾��ɽ��"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "��«"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "����ϫƯ����(_o)"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%p %I:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "ɽ�������"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:1844
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "������"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "��"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>���������������˥��顼</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "��������ɽ������ URI"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>���������������˥��顼:<br>�᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "�����ǥ������顼��"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "ɽ��"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "��å������μ�����"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "��«��ɽ��"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "ɽ�����ץ����"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "��������ɽ��"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "TODO���"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "���������������"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "��������ɽ������ URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "��å�����ɽ��(_M)"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M �Τ��ʤ�����«�ˤĤ�������"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "���λ��˲��ڤ��������:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "���ѤǤ��륵�ޥ꡼�Ϥ���ޤ���"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "�Ĥ���"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "���λ��˥ץ�������¹Ԥ���:"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "��«���Խ�"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "���顼����߻��� (ʬ)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "��"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "���٤ƹ��� "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "��"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 ��"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 ��"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "���λ��˲��ڤ��������:"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "���λ��˥�����������ɽ������:"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "���λ��˥᡼�����������:"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "���λ��˥ץ�������¹Ԥ���:"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr "�ǽ����«����"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr "�ǽ����«�θ�"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr "�Ǹ����«����"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr "�Ǹ����«�θ�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "����"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "����/����:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "��¥��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "����..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���ޥ�:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "���ץ����(_O)"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2028,7 +2357,7 @@ msgstr "��«�κǸ夬�в�"
 msgid "hour(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -2065,36 +2394,38 @@ msgid "60 minutes"
 msgstr "60 ʬ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "������ָ�˥��顼�ब�����ॢ����"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "�����ǥ������顼��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "���顼�०����ɥ������줿�� BEEP �����Ĥ餹"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "������������"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "���顼"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "������ɽ�����ʤ�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "�������ץ����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2102,179 +2433,284 @@ msgid "Defaults"
 msgstr "�ǥե����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "ɽ�����ץ����"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "ɽ��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:155
-msgid "Due Date"
-msgstr "����"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "���顼����ߤ�ͭ��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "��������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "���λϤ�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "��Ĵ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "���������¤Υ����ƥ�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "���������¤Υ����ƥ�:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "�ޤ����¤ǤϤʤ������ƥ�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "�ޤ����¤ǤϤʤ������ƥ�:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "���¤�᤮�������ƥ�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "���¤�᤮�������ƥ�:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "���顼������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:158
-msgid "Priority"
-msgstr "ͥ����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "���¤�᤮�������ƥ�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "���٤Ƥ���«���¥����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "ɽ��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "��«�ν�λ���֤�ɽ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "���ֹ��ɽ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "�����λϤޤ�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "�������ѥå�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "���������¤Υ����ƥ�"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "���¤ޤǤλ���"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "�ɾ�(���Ĥ�)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "��ʬ��:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "���֤ν�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"�����ॾ����: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "��Х��顼��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "����ϫƯ����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "����ϫƯ����(_o)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "ʬ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr " ��"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "������ %d �ĤΥ������������Ƥ��������Ǥ���?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "�����˻������� `%s' �������Ƥ��������Ǥ���?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "��λ���ޤ���"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "��λ���ޤ���"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "����"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "��«���Խ�"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "��«"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "������"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "��������(_J) (FIXME)"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+#, fuzzy
+msgid "No summary"
+msgstr "���ޥ꡼"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "�ե�������񤭤��ޤ���?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
+"��񤭤��ޤ���?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "��̾����¸..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
@@ -2318,25 +2754,55 @@ msgstr "������ %d �ĤΥ������������Ƥ��������Ǥ���?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "������ %d �Ĥλ��������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/event-editor.c:112
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "�ե����������"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "���������:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"�����ॾ����: "
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "��«"
 
-#: calendar/gui/dialogs/event-editor.c:117
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "��¥��"
 
-#: calendar/gui/dialogs/event-editor.c:122
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "��ȯ"
 
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "�ǹ礻�򥭥�󥻥�"
+
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
 msgstr "�����Υ��٥��(_l)"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "ʬ��"
 
@@ -2365,11 +2831,6 @@ msgstr "���ޥ꡼(_m):"
 msgid "_Confidential"
 msgstr "��̩(_C)"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "���󥿥���(_C)..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "�����(_E):"
@@ -2378,38 +2839,271 @@ msgstr "�����(_E):"
 msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "���롼��̾:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "��ȯ"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "��Ĺ"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "���üԤ�ɬ��"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Ǥ�ջ��ü�"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "�Ի��ü�"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "ư����ɲ�"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " ���� "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " ���� "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "����"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "���"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "������"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "�ֺ�����"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "���üԤ�ɬ��"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Ǥ�ջ��ü�"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "�Ի��ü�"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "������"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "���..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "���ʼ�"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "���"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "���"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "���"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "�ޥ͡�����"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "12 ��"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "���"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 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 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "����"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "��ż�:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "��ż�:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "¾�ξ���(_I)..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "��ż�:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "������«�� Evolution ���Խ�����ʤ���ȯ��ޤ�Ǥ��ޤ�"
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "�����"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "��ȯ�Υ������ޥ���"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "�㳰"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "����"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "��ȯ�ʤ�"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "�ץ�ӥ塼"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "��ȯ�롼��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "����ץ�ʺ�ȯ"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "����"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -2438,48 +3132,47 @@ msgstr "��"
 msgid "year(s)"
 msgstr "ǯ"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
-#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "������«�� Evolution ���Խ�����ʤ���ȯ��ޤ�Ǥ��ޤ�"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "�ѹ�����¸�������Ǥ���?"
 
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "��"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "�����"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�ѹ�����¸�������Ǥ���?"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "���:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "���"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "���"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "����"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:110
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "������"
 
@@ -2508,273 +3201,323 @@ msgstr "ͥ����(_P):"
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/e-calendar-table.c:150
-msgid "Categories"
-msgstr "���ƥ���"
-
-#: calendar/gui/e-calendar-table.c:152
-msgid "Completion Date"
-msgstr "���"
-
-#: calendar/gui/e-calendar-table.c:153
-msgid "End Date"
-msgstr "���"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Start Date"
-msgstr "������"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Geographical Position"
-msgstr "���ٷ���"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "Percent complete"
-msgstr "�ѡ�����ȴ�λ"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Summary"
-msgstr "���ޥ꡼"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Transparency"
-msgstr "Ʃ����"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Alarms"
-msgstr "���顼��"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Click here to add a task"
-msgstr "���������ɲä��뤿��ˤ����򥯥�å�"
-
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:737
-msgid "Edit this task"
-msgstr "���Υ��������Խ����ޤ�"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "����(_O)"
 
-#: calendar/gui/e-calendar-table.c:739
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "���ԡ�(_C)"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Ž���դ�(_P)"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "��λ��ޡ������ޤ�"
 
-#: calendar/gui/e-calendar-table.c:740
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "���Υ������������ޤ�"
 
-#: calendar/gui/e-calendar-table.c:745
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "��λ������������ޡ������ޤ�"
 
-#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "���򤷤��������������ޤ�"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:284
-#: calendar/gui/print.c:782
-msgid "am"
-msgstr "����"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "���������ɲä��뤿��ˤ����򥯥�å�"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:784
-msgid "pm"
-msgstr "���"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ��λ(_l):"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "���顼��"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "���ƥ���"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "��λ���ޤ���"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "���"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "����"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "���"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "���ٷ���"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "ͥ����"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "������"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "���ޥ꡼"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "������"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Ʃ����"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1275
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%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/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1289
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1302
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:3129 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "����"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "���"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "������«"
 
-#: calendar/gui/e-day-view.c:3131 calendar/gui/e-week-view.c:2968
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "���������Υ��٥��"
 
-#: calendar/gui/e-day-view.c:3136 calendar/gui/e-week-view.c:2973
-msgid "Go to Today"
-msgstr "�����ذ�ư"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "�����ذ�ư(_T)"
 
-#: calendar/gui/e-day-view.c:3138 calendar/gui/e-week-view.c:2975
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "�������ذ�ư..."
 
-#: calendar/gui/e-day-view.c:3145 calendar/gui/e-week-view.c:2981
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "����"
-
-#: calendar/gui/e-day-view.c:3147 calendar/gui/e-week-view.c:2983
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "������«����"
 
-#: calendar/gui/e-day-view.c:3149 calendar/gui/e-week-view.c:2985
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "�ǹ礻�Υ������塼��"
-
-#: calendar/gui/e-day-view.c:3158 calendar/gui/e-week-view.c:2998
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "���ν�������ư�ˤ���"
 
-#: calendar/gui/e-day-view.c:3160 calendar/gui/e-week-view.c:3000
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "����������"
 
-#: calendar/gui/e-day-view.c:3162
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i ʬʬ��"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:163
-msgid "I couldn't update your calendar file!\n"
-msgstr "�������ե�����򹹿�����ޤ���Ǥ���!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "�����͹��ʪ�ν���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:169 calendar/gui/e-itip-control.c:512
-msgid "Component successfully updated."
-msgstr "����ݡ��ͥ�Ȥ���������������ޤ���"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:175
-msgid "There was an error loading the calendar file."
-msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:199
-msgid "I couldn't open your calendar file!\n"
-msgstr "�������ե�����򳫤����Ȥ�����ޤ���Ǥ���!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
-#: calendar/gui/e-itip-control.c:460 calendar/gui/e-itip-control.c:531
-msgid "I couldn't load your calendar file!\n"
-msgstr "�������ե����������ɤ��뤳�Ȥ�����ޤ���Ǥ���!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:472
-msgid "I couldn't read your calendar file!\n"
-msgstr "�������ե�������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:485
-msgid "This is a reply from someone who was uninvited!"
-msgstr "����Ͼ�������ï��������ֻ��Ǥ�!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:501
-msgid "I couldn't update your calendar store."
-msgstr "��¸�����������򹹿�����ޤ���Ǥ���"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
-msgid "I couldn't delete the calendar component!\n"
-msgstr "����������ݡ��ͥ�Ȥ�������ޤ���Ǥ���!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:552
-msgid "Component successfully deleted."
-msgstr "����ݡ��ͥ�Ȥ��������������ޤ���"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:696
-msgid "I don't recognize this type of calendar component."
-msgstr "���Υ���������ݡ��ͥ�Ȥμ��̤�ǧ�����ޤ���"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
-msgid "Add to Calendar"
-msgstr "���������ɲ�"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Accept "
-msgstr " ���� "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: calendar/gui/e-itip-control.c:817
-msgid " Decline "
-msgstr " ���� "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:818
-msgid " Tentative "
-msgstr " ���� "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:862
-msgid "Update Calendar"
-msgstr "�������򹹿�"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "�������ե�����򹹿�����ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:885
-msgid "Cancel Meeting"
-msgstr "�ǹ礻�򥭥�󥻥�"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "�������ե�����򳫤����Ȥ�����ޤ���Ǥ���!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2793,14 +3536,14 @@ msgstr "������������"
 msgid "Date:"
 msgstr "����:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "���������������"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "���������������..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "��ż�:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "�����Х�å�����:"
@@ -2813,178 +3556,48 @@ msgstr "���"
 msgid "date-start"
 msgstr "������"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "���ʼ�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "���ʼԤν���"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "���ʼ�: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"����󥻥�\n"
-"�ǹ礻"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "��Ĺ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "�ǹ礻�ΰ���"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "�Ի��ü�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Ǥ�ջ��ü�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "��ż�:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"ȯɽ\n"
-"���٥��"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"�׵�\n"
-"�ǹ礻"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "���üԤ�ɬ��"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "���"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"�������塼��\n"
-"����"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "���ơ�����"
-
-#: calendar/gui/e-tasks.c:181 calendar/gui/e-tasks.c:525
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "���٤�"
 
-#: calendar/gui/e-tasks.c:187
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "���ƥ���:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:345
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-week-view.c:2966 calendar/gui/e-week-view.c:2989
-msgid "New Appointment..."
-msgstr "������«..."
-
-#: calendar/gui/e-week-view.c:3002
-msgid "Delete All Occurrences"
-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/e-week-view-main-item.c:342 calendar/gui/print.c:1583
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "���ޥ꤬���Τ�Τ�ޤ�"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "���������Τ�Τ�ޤ�"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "�����Ȥ����Τ�Τ�ޤ�"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "���Υ��ƥ�������"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "������«..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "��������ɽ������ Bonobo ����ȥ�����Υ���ץ�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution ������ iTip/iMip �ӥ塼��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "�������򰷤������ Evolution ����ݡ��ͥ��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution ����������ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 ��"
@@ -3006,231 +3619,256 @@ msgid "Go To Date"
 msgstr "���ˤ��˰�ư"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "�����ذ�ư"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "1 ��"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "7 ��"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "6 ��"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "3 ��"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "5 ��"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "11 ��"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "10 ��"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "�����ذ�ư"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1 ��"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2 ��"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3 ��"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4 ��"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5 ��"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6 ��"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7 ��"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8 ��"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9 ��"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10 ��"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11 ��"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12 ��"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13 ��"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14 ��"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15 ��"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16 ��"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17 ��"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18 ��"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19 ��"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20 ��"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21 ��"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22 ��"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23 ��"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24 ��"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25 ��"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26 ��"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27 ��"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28 ��"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29 ��"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30 ��"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31 ��"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "��"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "������"
+
 #. Day
-#: calendar/gui/print.c:1951
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "���������� [%Y/%b/%d (%a)]"
 
-#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/print.c:1971
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1982
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "���� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1990
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "���� (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1997
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "��ǯ (%Y)"
 
-#: calendar/gui/print.c:2212
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "���������"
 
-#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1487
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "�����ץ�ӥ塼"
 
-#: calendar/gui/tasks-control.c:112
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "���Υ����ƥ�����"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "�ץ�󥿤�����"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "�������ե������ɽ������ URI"
 
@@ -3239,8 +3877,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolution �ϥ������ե�����Υ������������, ��ưŪ�˿������������ե������"
-"��ư���ޤ�"
+"Evolution �ϥ������ե�����Υ������������, "
+"��ưŪ�˿������������ե�����ذ�ư���ޤ�"
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3249,10 +3887,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution �ϥ������ե�����Υ������������, �������������ե�����ذ�ư����"
-"���Ȥ��ޤ���\n"
-"������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, �Ǥ��ΤǤ��Υץ���"
-"���Ϥ��θ�Ƥӻ���Ǥ��礦"
+"Evolution �ϥ������ե�����Υ������������, "
+"�������������ե�����ذ�ư���褦�Ȥ��ޤ���\n"
+"������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, "
+"�Ǥ��ΤǤ��Υץ������Ϥ��θ�Ƥӻ���Ǥ��礦"
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3260,8 +3898,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' �򳫤����Ȥ�����ޤ���Ǥ���; �������ե�������饿�����ե�����ذ�ư��"
-"�륢���ƥब����ޤ���"
+"`%s' �򳫤����Ȥ�����ޤ���Ǥ���; "
+"�������ե�������饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3269,103 +3907,13 @@ 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' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; �������ե������"
-"�饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
+"`%s' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; "
+"�������ե�������饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr ""
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
@@ -3386,65 +3934,80 @@ msgstr "��沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 msgid "Decryption is not supported by this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:666
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "��å����� %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
-msgid "Complete"
-msgstr "��λ���ޤ���"
-
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:883
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:888
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
@@ -3480,14 +4043,33 @@ msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "fork ����ޤ���Ǥ���: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s �Υ��å��ե����������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3503,113 +4085,108 @@ msgstr "fcntl(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "�᡼��ե����� %s ������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "�᡼��ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "�᡼��ե����� %s �Υƥ�ݥ��򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s �Υ��å��ե������ƥ��Ƚ���ޤ���Ǥ���: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "�᡼��ե�������ɤ߹�����˥��顼: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "��ȥե����� %s �إ᡼�����¸�˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�ѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork ����ޤ���Ǥ���: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail �ץ������ϼ��Ԥ��ޤ���: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(̤�ΤΥ��顼)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "�᡼��ե�������ɤ߹�����˥��顼: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "�����󤹤뤿��Υץ쥤��ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "�󶡤��줿�ѥ���ɤϤ���ޤ���"
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "���ꥢ�����󤹤뤿��Υץ쥤��ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "�٥�ե������뤿��Υץ쥤��ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "��ȥե������������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "��沽���뤿��Υץ쥤��ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "�����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "���沽���뤿��ΰŹ�ƥ����Ȥ�����ޤ���"
 
@@ -3617,8 +4194,8 @@ msgstr "���沽���뤿��ΰŹ�ƥ����Ȥ�����ޤ���"
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
-"%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: ���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ�"
-"�ݡ��Ȥ��Ƥ��ޤ���"
+"%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: "
+"���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -3645,7 +4222,7 @@ msgid "Connection cancelled"
 msgstr "��³�ϥ���󥻥뤷�ޤ���"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
@@ -3654,13 +4231,13 @@ msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
 msgid "(unknown host)"
 msgstr "(̤�ΤΥۥ���)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "�����Ф��������Ǥ��ޤ���"
 
@@ -3712,8 +4289,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� CRAM-MD5 ǧ�ڤ�"
-"�Ȥäƥ����Ф���³���ޤ�"
+"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� CRAM-MD5 "
+"ǧ�ڤ�Ȥäƥ����Ф���³���ޤ�"
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3724,8 +4301,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� DIGEST-MD5 ��"
-"�Ȥäƥ����Ф���³���ޤ�"
+"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� DIGEST-MD5 "
+"��Ȥäƥ����Ф���³���ޤ�"
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -3770,7 +4347,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -3839,7 +4416,7 @@ msgstr ""
 msgid "No provider available for protocol `%s'"
 msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3885,33 +4462,17 @@ msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 msgid "Failed to verify certificates."
 msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1017 mail/mail-ops.c:1024
-#: mail/mail-ops.c:1042 mail/mail-ops.c:1043
-msgid "Trash"
-msgstr "����Ȣ"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"�᡼��: %s\n"
-"����̾: %s\n"
-"�ȿ���˥å�: %s\n"
-"�ȿ�: %s\n"
-"���: %s\n"
-"��: %s\n"
-"��: %s"
+"ȯ��: %s\n"
+"�о�: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3926,26 +4487,36 @@ msgstr ""
 "\n"
 "������˾�ߤޤ���?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"ȯ��: %s\n"
-"�о�: %s"
+"�᡼��: %s\n"
+"����̾: %s\n"
+"�ȿ���˥å�: %s\n"
+"�ȿ�: %s\n"
+"���: %s\n"
+"��: %s\n"
+"��: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
@@ -3954,68 +4525,75 @@ msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "���Υ���Ȣ�ե���������å������򥳥ԡ����뤳�Ȥ�����ޤ���"
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "̤�ΤΥ��顼"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "�����Х쥹�ݥ󥹤Ϥ��ä��ʤ������ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "�ե�������˲�����ƺ�������ޤ���"
 
-#: camel/providers/imap/camel-imap-folder.c:415
-msgid "Scanning IMAP folder"
-msgstr "IMAP �ե������������"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "��å���������¸��"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "��å���������¸��"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "����᡼��Υ����å�"
 
@@ -4023,7 +4601,7 @@ msgstr "����᡼��Υ����å�"
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "�ե����"
 
@@ -4056,28 +4634,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
 
-#: camel/providers/imap/camel-imap-store.c:465
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:475
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:499
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:514
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:540
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4088,36 +4666,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "MH�饤���ʥ᡼��ǥ��쥯�ȥ�˥�������᡼�����¸���ޤ�"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "ɸ��Ū�� UNIX �� mailbox �ե�����"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "ɸ�� mbox �����ǥ�������᡼�����¸���ޤ�"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir�����Υ᡼��ե�����"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "qmail maildir�ǥ��쥯�ȥ�˥�������᡼�����¸���ޤ�"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir�����Υ᡼��ե�����"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "qmail maildir�ǥ��쥯�ȥ�˥�������᡼�����¸���ޤ�"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
@@ -4158,7 +4751,8 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "�ե�������饤��ǥå����ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
 
@@ -4174,6 +4768,7 @@ msgstr "maildir �����Υե�����إ�å��������ɲý���ޤ���: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4185,6 +4780,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
 
@@ -4193,7 +4789,7 @@ msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
 msgid "Invalid message contents"
 msgstr "��å����������Ƥ�̵���Ǥ�"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4203,14 +4799,14 @@ msgstr ""
 "�ե���� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4220,22 +4816,29 @@ msgstr ""
 "�ե���� `%s' ���������ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' �� maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"�ե���� `%s' ���������ޤ���Ǥ���:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4243,11 +4846,13 @@ 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:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
@@ -4260,6 +4865,9 @@ msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4269,10 +4877,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
@@ -4318,36 +4928,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "�ե�����򥵥ޥ饤����"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "�ե�����򳫤��ޤ���Ǥ���: %s: �ݥ������ %ld ���饵�ޥ饤����: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1598
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "�ե������Ʊ����"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "�ե�����򥵥ޥ饤�����뤳�Ȥ�����ޤ���Ǥ���: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
@@ -4356,21 +4975,28 @@ msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
@@ -4385,7 +5011,9 @@ msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 msgid "Could not rename folder: %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "̤�ΤΥ��顼: %s"
@@ -4405,39 +5033,93 @@ msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' ���̾�Υե�����ǤϤ���ޤ���"
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "��������᡼��ե����� %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "�᡼��ե����� %s �Υƥ�ݥ��򳫤����Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s �� NNTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "�����Фϥ桼��̾����ݤ��ޤ���"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "�����Фإ桼��̾�������˼��Ԥ��ޤ���"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "�����Фϥ桼��̾/�ѥ���ɤ���ݤ��ޤ���"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "��å����� %s �ϸ��դ���ޤ���"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "�����Ф��饰�롼�ץꥹ�Ȥ��������ޤ���Ǥ���"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s �Υ��롼�ץꥹ�ȥե����������ɽ���ޤ���: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s �Υ��롼�ץꥹ�ȥե��������¸����ޤ���: %s"
@@ -4450,25 +5132,25 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "�˥塼�������ФΥǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ��ͳ�� USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� NNTP �����Ф�ǧ�ڤ��ޤ�"
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s �� .newsrc �ե����������ޤ��ϳ������Ȥ�����ޤ���: %s"
@@ -4519,7 +5201,7 @@ msgstr "�����Ф˥�å�������Ĥ�"
 msgid "Delete after %s day(s)"
 msgstr "%s ����˺������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4528,8 +5210,9 @@ msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
-"POP �����Ф���³���뤿���, POP �ץ��ȥ��������� web �᡼��ץ��Х������ȼ�"
-"�Υ᡼�륷���ƥफ�� E �᡼���������뤿��˻Ȥ����Ȥ�����ޤ�"
+"POP �����Ф���³���뤿���, POP �ץ��ȥ��������� web "
+"�᡼��ץ��Х������ȼ��Υ᡼�륷���ƥफ�� E "
+"�᡼���������뤿��˻Ȥ����Ȥ�����ޤ�"
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
@@ -4545,9 +5228,9 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"���Υ��ץ����� APOP �ץ��ȥ����ͳ�ǰŹ沽���줿�ѥ���ɤ�Ȥä� POP ����"
-"�Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, ���٤ƤΥ桼��������"
-"��ư���櫓�ǤϤ���ޤ���."
+"���Υ��ץ����� APOP �ץ��ȥ����ͳ�ǰŹ沽���줿�ѥ���ɤ�Ȥä� POP "
+"�����Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, "
+"���٤ƤΥ桼���������ư���櫓�ǤϤ���ޤ���."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
@@ -4611,7 +5294,7 @@ msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4625,8 +5308,7 @@ msgstr ""
 #: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
+msgstr "sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
@@ -4665,7 +5347,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4673,122 +5355,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP��Ȥäƥ�⡼�ȥ᡼��ϥ֤���³���뤳�Ȥǥ᡼����ۿ����ޤ�\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "��ʸ���ϥ��顼, ���ޥ�ɤǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "�ѥ�᡼�����뤤�ϰ����˹�ʸ���ϥ��顼"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "���ޥ�ɤϼ�������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "���ޥ�ɥѥ�᡼���ϼ�������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "�����ƥॹ�ơ��������뤤�ϥ����ƥ�إ�ױ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "�إ�ץ�å�����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "�����ӥ������ѤǤ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "�����ӥ������������ͥ���Ĥ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "�����ӥ������ѤǤ��ޤ���, ���������ͥ���Ĥ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "�׵ᤵ�줿�᡼���ư���OK, ��λ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ��ž�����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "�׵ᤵ�줿�᡼���ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå��������ѤǤ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "�׵ᤵ�줿ư������Ǥ��ޤ���: ������˥��顼"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "�桼���ϥ�������ǤϤ���ޤ���; <forward-path> ���Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �����ƥ����¸�ΰ褬­��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "�׵ᤵ�줿�᡼���ư������Ǥ��ޤ���: �ΰ������Ƥ�ۤ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "�׵ᤵ�줿ư��ϴ�λ���ޤ���: �᡼��ܥå���̾��ǧ����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "�᡼������Ϥ򳫻Ϥ��ޤ�; <CRLF>.<CRLF> �ǽ�λ���ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "�����ϼ��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "�ѥ���ɤ��ѹ���ɬ�פǤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "ǧ�ڥᥫ�˥�����Խ�ʬ�᤮�ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "�׵ᤷ��ǧ�ڥᥫ�˥���Τ���˰Ź沽��ɬ�פǤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4799,115 +5481,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹���������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "��������������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "ǧ��"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH �׵�˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
+msgstr "DATA �쥹�ݥ󥹥��顼: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
@@ -4937,75 +5631,137 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:336 mail/mail-display.c:123
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "ź��"
 
-#: composer/e-msg-composer-attachment-bar.c:426
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "�ե������ź�դ��ޤ�"
-
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "ź�դ��ɲ�..."
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:11
-msgid "Attachment"
-msgstr "ź��"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "ź�դΥץ��ѥƥ�"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "�ե�����̾:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "����饤���ź��"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME ������:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "������:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer.c:621
-#, c-format
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "���п�:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "�ֿ���:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "��̾:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "����:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"��å������μ����ԥꥹ�Ȥ���˸���ʤ���, "
+"��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "�ե������ź�դ��ޤ�"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"��̾�ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���:\n"
+"�ե����� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: composer/e-msg-composer.c:794
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "�ե�����Υ�������˥��顼: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "�ٹ�"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: composer/e-msg-composer.c:897
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5013,12 +5769,53 @@ msgstr ""
 "���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
 "�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
 
-#: composer/e-msg-composer.c:959 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:228
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"���ϥե�������������ޤ���: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"���ϥե�������������ޤ���: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"�ե��������¸��˥��顼: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution �� Pine �᡼��ե������ȯ�����ޤ���\n"
+"Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5028,100 +5825,29 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "�ե�����򳫤�"
 
-#: composer/e-msg-composer.c:1146
-msgid "That file does not exist."
-msgstr "���Υե������¸�ߤ��ޤ���"
-
-#: composer/e-msg-composer.c:1156
-msgid "That is not a regular file."
-msgstr "������̾�Υե�����ǤϤ���ޤ���"
-
-#: composer/e-msg-composer.c:1166
-msgid "That file exists but is not readable."
-msgstr "���Υե������¸�ߤ��ޤ������ɤ߼���ǽ�ǤϤ���ޤ���"
-
-#: composer/e-msg-composer.c:1176
-msgid "That file appeared accesible but open(2) failed."
-msgstr "���Υե�����ϥ���������ǽ�Τ褦�˸����ޤ�����open(2) �ϼ��Ԥ��ޤ���"
-
-#: composer/e-msg-composer.c:1198
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"�ե�����ϤȤƤ��礭�� (100K �ʾ�) �Ǥ�\n"
-"�����ˤ�����������뤳�Ȥ�˾�ߤޤ���?"
-
-#: composer/e-msg-composer.c:1219
-msgid "An error occurred while reading the file."
-msgstr "�ե������ɹ���δ֤˥��顼��ȯ�����ޤ���"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "�ƥ����ȥե����������..."
 
-#: composer/e-msg-composer.c:1582 composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "��å�������������ޤ�"
 
-#: composer/e-msg-composer.c:2021
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "�᡼�����������ɥ����������ޤ���Ǥ���"
 
-#: composer/e-msg-composer-hdrs.c:324
-msgid "Click here for the address book"
-msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:355
-msgid "From:"
-msgstr "���п�:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:361
-msgid "Reply-To:"
-msgstr "�ֿ���:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:372
-msgid "Subject:"
-msgstr "��̾:"
-
-#: composer/e-msg-composer-hdrs.c:386
-msgid "To:"
-msgstr "����:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the recipients of the message"
-msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
-
-#: composer/e-msg-composer-hdrs.c:390
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
-
-#: composer/e-msg-composer-hdrs.c:394
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"��å������μ����ԥꥹ�Ȥ���˸���ʤ���, ��å������Υ����ܥ󥳥ԡ��������"
-"�륢�ɥ쥹�����Ϥ��ޤ�"
-
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5129,7 +5855,7 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution �᡼������ν����������ޤ���"
 
@@ -5146,42 +5872,56 @@ msgid "calendar information"
 msgstr "����������"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-#: e-util/e-time-utils.c:323
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:90 e-util/e-time-utils.c:201
-#: e-util/e-time-utils.c:315
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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:97 e-util/e-time-utils.c:208
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%Y/%m/%d (%a)"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5189,249 +5929,65 @@ msgstr "%Y/%m/%d (%a)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML �ե�����򳫤����Ȥ�����ޤ���:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"�ǡ����Ӥ߹�����˥��顼:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "�ե�����ϥ����ӥ��ξ�����äƤ��ޤ���\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "�����ӥ�������"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"�¹ԥ��ޥ꡼���ط�����̡���HTML�ڡ��������򤹤뤳�Ȥ�����ޤ�\n"
-"\n"
-"�ǥե���Ȥ϶���Ǥ�"
-
-#: executive-summary/component/e-summary-url.c:70
-#: executive-summary/component/e-summary-url.c:75
-#: executive-summary/component/e-summary-url.c:82
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "�ǥե���Ȥ�GNOME���ץꥱ�������� %s �򳫤�"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "�ǥե���Ȥ�GNOME�����֥֥饦���� %s �򳫤�"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s ����᡼�������"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Change the view to %s"
-msgstr "%s �إӥ塼���ѹ�"
-
-#: executive-summary/component/e-summary-url.c:74
-#, c-format
-msgid "Run %s"
-msgstr "%s ��¹�"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Close %s"
-msgstr "%s ���Ĥ���"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the left"
-msgstr "���� %s ���ư"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s to the right"
-msgstr "���� %s ���ư"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "���������� %s ���ư"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Move %s into the next row"
-msgstr "���������� %s ���ư"
-
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Configure %s"
-msgstr "%s ������"
-
-#: executive-summary/component/e-summary-url.c:554
-msgid "page"
-msgstr "�ڡ���"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "����"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "�ط�:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"�¹ԥ��ޥ꡼����ݡ��ͥ�Ȥ� Bonobo ����������ޤ���Ǥ���\n"
-"�⤷ RootPOA �ˤĤ��Ƥηٹ��å�����������ʤ顤���֤� OAF �������\n"
-"GOAD ��Ȥäƥ���ѥ��뤷�����Ȥ��̣���ޤ�"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "�¹ԥ��ޥ�Τ���� Evolution ����ݡ��ͥ��"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution �¹ԥ��ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF ���ޥ�Τ���Υե����ȥ�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF ���ޥ�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "�ƥ��� Bonobo ����ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "�ƥ��ȥ���ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "�ƥ��� Bonobo �����ӥ�"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "�ƥ��ȥ����ӥ�"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "���顼"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "��ưŪ�˹���"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "����������"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "���٤ƹ��� "
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "ʬ"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ǯ"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "ǯ"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "��"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "��"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "��"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "��"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "��"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "��"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "��"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "ʬ"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr " ��"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " ��"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "���դ������˺��Ƥ��ޤ�"
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "̵�������դ����򤷤Ƥ��ޤ�"
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5441,7 +5997,7 @@ msgstr ""
 "������������å����������դϤɤ�ʻ��֤�\n"
 "�Ф��ƤǤ���Ӥ����Ǥ��礦"
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5449,7 +6005,7 @@ msgstr ""
 "��å����������դϤ����ǻ��ꤹ����֤��Ф���\n"
 "��Ӥ����Ǥ��礦"
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5460,28 +6016,36 @@ msgstr ""
 "�㤨�С�\"�콵����\""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "���߻���"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "���ꤹ�����"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "���߻���ؤ����л���"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "�����"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "��"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<���դ����򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
@@ -5506,8 +6070,8 @@ msgstr ""
 "�ե�����������˺��Ƥ��ޤ�\n"
 "��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:687
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "�ե����������"
 
@@ -5519,46 +6083,6 @@ msgstr "�ե���� URI ������"
 msgid "<click here to select a folder>"
 msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "�ե��륿���Խ�"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "���ۥե�������Խ�"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "����"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "����"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "���ۥե����"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "����ե��������"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "���ۥե�����Υ�����"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "���٤Ƥ�ͭ���ʥ�⡼�ȥե����"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "���٤ƤΥ��������ͭ���ʥ�⡼�ȥե����"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "���٤ƤΥ�������ե����"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5580,37 +6104,89 @@ msgstr "�롼��̾: "
 msgid "Untitled"
 msgstr "�����ȥ�ʤ�"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "�⤷"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "���ξ���ư���¹�:"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "���٤Ƥδ�ब��ä���"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "�����Ĥ��δ�ब��ä���"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "�����ɲ�"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "����"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "����"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "�ɲ�"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "�Խ�"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "�ե��륿���Խ�"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "���ۥե�������Խ�"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "����"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "����"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "���ۥե����"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "����ե��������"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "���ۥե�����Υ�����"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "���٤Ƥ�ͭ���ʥ�⡼�ȥե����"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "���٤ƤΥ��������ͭ���ʥ�⡼�ȥե����"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "���٤ƤΥ�������ե����"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "�����ƺѤ�"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5685,89 +6261,90 @@ msgid "Expression"
 msgstr "ɽ��"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "���ɥ쥹��ž��"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "�����Τ�ΤȰ��פ���"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "�����Τ�Τ���礭��"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "�����Τ�ΤǤϤʤ�"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "�᡼��󥰥ꥹ��"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "��å������إå�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "��������������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "��������������"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "�ե�����ذ�ư"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "����ɽ���Ȱ���"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "�ֿ���"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "���ơ���������"
 
+#: filter/libfilter-i18n.h:44
+msgid "Size (kB)"
+msgstr ""
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "�����Τ�ΤΤ褦�˸�����"
@@ -5788,7 +6365,8 @@ msgstr "�����Τ�Τdz��Ϥ���"
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:774
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "��̾"
 
@@ -5816,29 +6394,23 @@ msgstr "�롼����Խ�"
 msgid "Score Rules"
 msgstr "�������롼��"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "����ݡ���"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "�᡼��"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm �����ꥢ��"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:195
-msgid "Don't ask me again"
-msgstr "���Υ�å����������٤�ɽ�����ʤ�"
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5846,15 +6418,15 @@ msgstr ""
 "Evolution �� Elm �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm �᡼��"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "���ɥ쥹Ģ"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5862,19 +6434,11 @@ msgstr ""
 "Evolution �� GnomeCard �ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "����"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1399
-msgid "Filters"
-msgstr "�ե��륿"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "���ɥ쥹Ģ"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5882,7 +6446,7 @@ msgstr ""
 "Evolution �� Netscape �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5890,180 +6454,209 @@ msgstr ""
 "Evolution �� Pine �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine �᡼��"
 
-#: mail/component-factory.c:401
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "�᡼��򰷤������ Evolution ����ݡ��ͥ��"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution �᡼�륳��ݡ���"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution �᡼��ե�����ǥ����ץ쥤����ݡ��ͥ��"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolutgion �᡼��ե�����ե����ȥꥳ��ݡ��ͥ��"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution �᡼�륳��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "�᡼������Υ��󥿡��ե�����"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "�ץ��ѥƥ�(_P)..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "�ե�����Υץ��ѥƥ��������ޤ�"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:527
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
-#: mail/folder-browser.c:339
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" �Υץ��ѥƥ�"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "�ץ��ѥƥ�"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_n)"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_j)"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_d)"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_c)"
 
-#: mail/folder-browser.c:687
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:696
-msgid "_Open"
-msgstr "����(_O)"
-
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "������"
 
-#: mail/folder-browser.c:700 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:123 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
-#: mail/folder-browser.c:702 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:707 ui/evolution-mail.xml.h:122
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:709 ui/evolution-mail.xml.h:77
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "�������ֿ�(_A)"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:714
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "���ɤȤ��ƥޡ���(_k)"
 
-#: mail/folder-browser.c:716
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "̤�ɤȤ��ƥޡ���(_n)"
 
-#: mail/folder-browser.c:721
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "����"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "̤�ɤȤ��ƥޡ���(_n)"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:723
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:727 ui/evolution-mail.xml.h:126
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "������(_U)"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "���ɥ쥹Ģ���ɲ�"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:741
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "��å���������롼������(_l)"
 
-#: mail/folder-browser.c:880
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
 
-#: mail/folder-browser.c:881
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:883
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
 
-#: mail/folder-browser-factory.c:210
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" �Υץ��ѥƥ�"
-
-#: mail/folder-browser-factory.c:212 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "�ץ��ѥƥ�"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "�᡼��򰷤������ Evolution ����ݡ��ͥ��"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution �᡼�륳��ݡ���"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution �᡼��¹ԥ��ޥꥳ��ݡ��ͥ��"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution �᡼��ե�����ǥ����ץ쥤����ݡ��ͥ��"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolutgion �᡼��ե�����ե����ȥꥳ��ݡ��ͥ��"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution �᡼�륳��ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "�᡼������Υ��󥿡��ե�����"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Evolution �� mbox �򥤥�ݡ��Ȥ���ե����ȥ�"
@@ -6114,37 +6707,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "ɬ�פʾ���Τ��٤Ƥ����Ƥ��ޤ���"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution ��������ȥ��ǥ���"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-accounts.c:124 mail/mail-accounts.c:175
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "��̾�ե�����:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"���Υ�å��������������Ƥ��ޤ���\n"
+"\n"
+"�ѹ�����¸���ޤ���?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (�ǥե����)"
 
-#: mail/mail-accounts.c:207
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "̵��"
 
-#: mail/mail-accounts.c:209 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "ͭ��"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:301
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-accounts.c:435 mail/mail-accounts.c:439
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "���"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "�ǥե���ȥ�������Ȥ���"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:597
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution ��������ȥޥ͡�����"
 
@@ -6172,7 +6797,7 @@ msgstr "%s �᡼��󥰥ꥹ��"
 msgid "Add Filter Rule"
 msgstr "�ե��륿�롼����ɲ�"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6184,7 +6809,7 @@ msgstr ""
 "ɬ�פ�����ޤ�\n"
 "�����ꤷ�ޤ���?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6192,7 +6817,7 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˿ȸ���\n"
 "����򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6200,11 +6825,11 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥᡼��\n"
 "����������򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6212,37 +6837,45 @@ msgstr ""
 "���Υ�å������Ϸ�̾������ޤ���\n"
 "�������������ޤ���?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:603
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "On %s, %s wrote:"
 
-#: mail/mail-callbacks.c:769
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "��å�������ž��:\n"
 
-#: mail/mail-callbacks.c:863
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "��å��������ư���ޤ�: "
 
-#: mail/mail-callbacks.c:865
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:1031
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1053
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6250,7 +6883,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1087
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6258,36 +6891,24 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1099
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1120
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:1154 mail/mail-display.c:93
-msgid "Overwrite file?"
-msgstr "�ե�������񤭤��ޤ���?"
-
-#: mail/mail-callbacks.c:1158 mail/mail-display.c:97
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
-"��񤭤��ޤ���?"
-
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1389
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6296,23 +6917,23 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1447
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "�ե��륿"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:1589
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
 
-#: mail/mail-config.c:1321 mail/mail-config.c:1324
-msgid "Connecting to server..."
-msgstr "�����Ф���³��..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6351,19 +6972,23 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"�᡼������ν����Ϥ���������λ���ޤ��������ʤ����󶡤����ȸ����᡼�륵����"
-"��\n"
-"�����ץ��ȥ���� Evolution �᡼�륢������Ȥ��뤿��˰�Ż��ˤ����Ǥ���"
-"��\n"
-"�ʲ��ˤ��Υ�������Ȥζ��֤�̾�������Ϥ��Ƥ�������������̾����ɽ����Ū����"
-"��\n"
+"�᡼������ν����Ϥ���������λ���ޤ��������ʤ����󶡤����ȸ����᡼�륵���Ф�"
+"\n"
+"�����ץ��ȥ���� Evolution "
+"�᡼�륢������Ȥ��뤿��˰�Ż��ˤ����Ǥ��礦\n"
+"�ʲ��ˤ��Υ�������Ȥζ��֤�̾�������Ϥ��Ƥ�������������̾����ɽ����Ū������"
+"\n"
 "���Ѥ���ޤ���"
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution ��������ȥ���������"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "�����Ф���³��..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "���ݡ��Ȥ��줿���̤�����å�"
@@ -6373,54 +6998,63 @@ msgid " color"
 msgstr " ���顼"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "��������Ⱦ���"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "��������ȴ���"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "��˲������ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "ź��"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "ǧ��"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "����᡼���ưŪ�˥����å�����"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "�᡼�����"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6436,215 +7070,277 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "�ǥե����(_f)"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "�ǥե���Ȥ� \"ž��\" ��ˡ: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "�ǥե���ȤΥ���饯�����å�: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "�ǥ����� ID..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "���"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "��ƥե����:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "�Խ�..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "�᡼�륢�ɥ쥹:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "ͭ��"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "�ե�͡���:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "�ǥ�����ID �����..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "��̾�ե�����:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "���Ѥ�Ĵ����"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "�ȸ�"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "HTML �᡼��"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "����饤��"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ������������ɤ߹���"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "�᡼��ܥå����η���"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "�ǥե���ȥ�������Ȥ���"
 
-#: mail/mail-config.glade.h:48
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "������ָ�˥�å������� \"����\" �Ȥ��ƥޡ���:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP ������"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "���٤Ȳ������ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "�˥塼��"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "�ղþ���"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "�ȿ�:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "PGP���� ID:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP �ץ������Υѥ�:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "���顼������"
+
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "���η�̾�Υ�å�������ե��륿����롼���������ޤ�"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "�᡼��μ�����"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "�᡼��μ���"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "�������ץ����"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "ɬ�ܾ���"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "�����奢 MIME"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "�������ƥ�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP �ץ�����������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "������"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "�����ѥ�å������ե����:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "�������:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "��̾�ե�����:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "������"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "����ʤ�"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "������"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "���̤ʥե����"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:88
-msgid "Type"
-msgstr "����"
-
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "�����奢��³ (SSL) ��Ȥ�"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "�桼��̾:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6654,217 +7350,230 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:96 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "�Խ�(_E)"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-crypto.c:59
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr " ��"
+
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "PGP ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "PGP ���ڥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "PGP �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "PGP ���楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME ����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-display.c:197
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "ź�դ���¸"
 
-#: mail/mail-display.c:237
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
-
-#: mail/mail-display.c:298
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "�ǥ���������¸..."
 
-#: mail/mail-display.c:300
-#, c-format
-msgid "Open in %s..."
-msgstr "%s �˳���..."
-
-#: mail/mail-display.c:302
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "����饤��ɽ��"
 
-#: mail/mail-display.c:337
-msgid "External Viewer"
-msgstr "�����ӥ塼��"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s �˳���..."
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "����饤��ɽ�� (%s��ͳ)"
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "����"
 
-#: mail/mail-display.c:989
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "�����ӥ塼��"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "��å����������Ƥ��ɤ߹�����"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "���򥳥ԡ� (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "��̾����¸ (FIXME)"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "���򥳥ԡ� (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "��̾����¸..."
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d ʬ"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d ��"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "�᡼�륢�ɥ쥹:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:766
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:769
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:772
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1094
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP �ץ����������꤬����ޤ���"
 
-#: mail/mail-format.c:1109
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
 
-#: mail/mail-format.c:1115
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "�Ź沽���줿��å�����"
 
-#: mail/mail-format.c:1116
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "��������򥯥�å��������沽���Ƥ�������"
 
-#: mail/mail-format.c:1172
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1180
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:1843
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:1881
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:1886
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:504
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' �򥪡��ץ���"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
 
-#: mail/mail-local.c:788
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����ޤ�"
-
-#: mail/mail-local.c:811
-msgid "Reconfiguring folder"
-msgstr "�ե�����κƹ�����"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:840
-msgid "Closing current folder"
-msgstr "���ߤΥե�����򥯥�������"
-
-#: mail/mail-local.c:872
-msgid "Renaming old folder and opening"
-msgstr "�Ť��ե�������͡��ष�ƥ����ץ���"
-
-#: mail/mail-local.c:890
-msgid "Creating new folder"
-msgstr "�����ե�����������"
-
-#: mail/mail-local.c:904
-msgid "Copying messages"
-msgstr "��å������򥳥ԡ���"
-
-#: mail/mail-local.c:921
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6873,7 +7582,7 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
 "���Ȥ�����ʤ��Ȥ��֤󵤤Ť����ΤǤ��礦: %s"
 
-#: mail/mail-local.c:960
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6881,12 +7590,17 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: mail/mail-local.c:1046
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "���Υ���Ȣ�ե���������å������򥳥ԡ����뤳�Ȥ�����ޤ���"
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s �����"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6895,7 +7609,7 @@ msgstr ""
 "'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6904,120 +7618,104 @@ msgstr ""
 "���ν������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "�����"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution �ʹ�"
-
-#: mail/mail-ops.c:607
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ��������"
 
-#: mail/mail-ops.c:611
-msgid "Sending message"
-msgstr "��������������"
-
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "������ %d / %d ��������"
 
-#: mail/mail-ops.c:745
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "��λ���ޤ���"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "�ե�����إ�å���������¸��"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s �إ�å��������ư��"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "��ư��"
 
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "���ԡ���"
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ����Υե������������"
 
-#: mail/mail-ops.c:1164
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "����Ȣ"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "��å�������ž��"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1343
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1272
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1411
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ե���� %s ������"
 
-#: mail/mail-ops.c:1495
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "%s ���� %s �إե�������ư��"
-
-#: mail/mail-ops.c:1497
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "%s ���� %s �إե�����򥳥ԡ���"
-
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "�ե�����򹹿���"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "�ե����������"
 
-#: mail/mail-ops.c:1735
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "������ %s �������"
 
-#: mail/mail-ops.c:1802
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "�������������"
 
-#: mail/mail-ops.c:1812
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "��å������ֹ� %d / %d (uid \"%s\") �������"
-
-#: mail/mail-ops.c:1886
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "��å���������¸��"
 
-#: mail/mail-ops.c:1965
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7026,12 +7724,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "��å����� %d / %d (uid \"%s\") ����¸��"
-
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7040,11 +7733,11 @@ msgstr ""
 "�ե��������¸��˥��顼: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "ź�դ���¸��"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7053,12 +7746,12 @@ msgstr ""
 "���ϥե�������������ޤ���: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2109
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/mail-ops.c:2176
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
@@ -7067,222 +7760,174 @@ msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 msgid "(Untitled Message)"
 msgstr "(�����ȥ�ʤ���å�����)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(�����ȥ�ʤ���å�����)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "������"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "��å������򸡺�"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "��ʸ��/��ʸ������̤���"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "��������"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "����:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "����(_S)"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "����󥻥���..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "�᡼���������"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "������"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "������..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "�Ե���..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "������"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "����󥻥뤷�ޤ���"
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "�ѥ��׾���Դ����ʥ�å��������񤫤�ޤ���!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "�᡼�륵�ޥ�"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-tools.c:156
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
 
-#: mail/mail-tools.c:203
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (��å�������ž��)"
-
-#: mail/mail-tools.c:213
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (��̾�ʤ�)"
-
-#: mail/mail-tools.c:230
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��å�������ž�����ޤ��� - %s"
 
-#: mail/mail-tools.c:232
-msgid "Forwarded message (no subject)"
-msgstr "��å�������ž�����ޤ��� (��̾�ʤ�)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "��å�������ž��"
 
-#: mail/mail-tools.c:439
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "��å�������ž��"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "���ۥե����"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:75
-msgid "Reply"
-msgstr "�ֿ�"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "��å������������Ԥ��ֿ����ޤ�"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:76
-msgid "Reply to All"
-msgstr "�������ֿ�"
-
-#: mail/message-browser.c:200
-msgid "Reply to all recipients of this message"
-msgstr "���Υ�å������μ������������ֿ����ޤ�"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:38
-msgid "Forward"
-msgstr "ž��"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "���Υ�å�������ž�����ޤ�"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "���򤵤줿��å�������������ޤ�"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "���Υ�å������������ޤ�"
-
-#: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:69 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "��"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "���Υ�å������ذ�ư���ޤ�"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "��"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "���Υ�å������ذ�ư���ޤ�"
-
-#: mail/message-list.c:684
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "̤��"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "����"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "�����Ѥ�"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "ʣ����̤�ɥ�å�����"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "ʣ���Υ�å�����"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "�Ǥ��㤤"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "�㤤"
 
-#: mail/message-list.c:697
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "�⤤"
 
-#: mail/message-list.c:698
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "�Ǥ�⤤"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%m�� %d�� %p %l:%M"
 
-#: mail/message-list.c:986
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating 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:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
@@ -7312,15 +7957,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "�ե���� \"%s\" �ι��ɲ����"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "���ɴ���"
 
-#: shell/e-setup.c:124 shell/e-setup.c:197
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "�¹ԥ��ޥ�Τ���� Evolution ����ݡ��ͥ��"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolution �¹ԥ��ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "��«"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "��«��ɽ��"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%p %I:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%p %l:%M (%a)"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "�᡼�륵�ޥ�"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "My Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>���������������˥��顼</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "��������ɽ��"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "���������:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%Y/%B/%e %A"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "My Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "��å������ΰ����˼��Ԥ��ޤ���"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "���ꥢ"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "����饤��"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "̵��"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "����"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "����(_t):"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "��¸�ߤ���"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "������"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "��"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "�Ǥ��㤤"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "�ƥ���"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "�Ǥ��㤤"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "ɽ��"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "�饸��"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "���������Τ�Τ�ޤ�"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "�Ƹ���"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "��"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "����������"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "���������Τ�Τ�ޤ�"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "�᡼��"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "���λ��˥�����������ɽ������:"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "���פʥ᡼��"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "�᡼��μ���"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "̤�Τ�ǧ�ھ��֤Ǥ�"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Light precipitation"
+msgstr "���Ѥ�Ĵ����"
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "̤�ΤΥ��顼"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "�ǹ礻�ΰ���"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Miss"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "��Ĺ"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "�᡼��󥰥ꥹ��"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "���Υ�����ɥ����Ĥ��ޤ�"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "��Ͽ"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "��������ɽ��"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "���Υ�����ɥ����Ĥ��ޤ�"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "����"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "�إå�"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "��"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "8 ��"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "TODO���"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "TODO���"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "�����Ѥ�"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "�ե����������"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "���٤Ƥ��դ�ź��"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "ɽ������ե�����򳫻Ϥ���:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "ɽ�����ץ����"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "ɽ��"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 ��"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "��"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 ����"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"�������塼��\n"
+"����"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "��������ɽ��"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "���٤ƤΥإå���ɽ��(_H)"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "��������ɽ��"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  ����:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "����¾"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "���򤵤줿��Τ򥯥ꥢ���ޤ�"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "4 ��"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution ������"
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "�ܺ�"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "�ǹ礻�򥭥�󥻥�"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "���̤ʥե����"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution �Υ��󥹥ȡ���"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7328,28 +9414,24 @@ msgstr ""
 "���� Evolution �ο������С������Ϥ��ʤ��Υѡ����ʥ� Evolution\n"
 "�ǥ��쥯�ȥ������ղåե�����򥤥󥹥ȡ��뤹��ɬ�פ�����ޤ�"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" �ǥե�����򥤥󥹥ȡ���, �ޤ��� \"����󥻥�\" �ǽ�λ���ޤ�"
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: shell/e-setup.c:172 shell/e-setup.c:240
-msgid "Evolution files successfully installed."
-msgstr "Evolution �Υե���������������󥹥ȡ��뤵��ޤ���"
-
-#: shell/e-setup.c:201
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "����� Evolution ��¹Ԥ����ǽ�Τ褦�˻פ��ޤ�"
 
-#: shell/e-setup.c:202
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution �桼���ե�����򥤥󥹥ȡ��뤷�ޤ��Τ� \"OK\" �򥯥�å����Ʋ�����"
 
-#: shell/e-setup.c:221
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7360,16 +9442,14 @@ msgstr ""
 "\n"
 "���顼: %s"
 
-#: shell/e-setup.c:236
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"'%s' ����˥ե������\n"
-"���ԡ�����ޤ���"
+msgstr "�ե������ɹ���δ֤˥��顼��ȯ�����ޤ���"
 
-#: shell/e-setup.c:303
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7380,7 +9460,7 @@ msgstr ""
 "Evolution �桼���ե�����Υ��󥹥ȡ����\n"
 "���Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-setup.c:317
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -7394,7 +9474,7 @@ msgstr ""
 "�������ɬ�פ�����ޤ�\n"
 "���Υǥ��쥯�ȥ�������ޤ���?"
 
-#: shell/e-setup.c:342
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7405,39 +9485,56 @@ msgstr ""
 "�ǥ��쥯�ȥ�ǤϤ���ޤ���Evolution �桼��\n"
 "�ե�����Υ��󥹥ȡ������Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-shell.c:391
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "�ե�������������ޤ���: %s: %s"
 
-#: shell/e-shell.c:1256
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"'%s' ����˥ե������\n"
+"���ԡ�����ޤ���"
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"`%s' �ӥ塼��������˴���ޤ��� :-(\n"
-"����Ϥ��֤� %s ����ݡ��ͥ�Ȥ�����å��夷�����Ȥ��̣���ޤ�"
 
-#: shell/e-shell-folder-commands.c:239
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "�ե���� \"%s\" �򥳥ԡ�����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:244
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "�ե�����Υ��ԡ�"
 
-#: shell/e-shell-folder-commands.c:281
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "�ե���� \"%s\" ���ư����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:286
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "�ե�����ΰ�ư"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "���Υե�����������ޤ�"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "�����˥����� `%s' �������Ƥ��������Ǥ���?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "�ե���� %s ������"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7446,15 +9543,15 @@ msgstr ""
 "���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �����ե�����κ���"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7462,11 +9559,11 @@ msgstr ""
 "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
 "ͭ���ǤϤ���ޤ���"
 
-#: shell/e-shell-folder-selection-dialog.c:328
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "����..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(�����ȥ�ʤ�)"
 
@@ -7478,11 +9575,12 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Evolution �إ���ݡ��Ȥ������ե���������򤷤ơ��ꥹ�Ȥ���ե�������̤�����"
-"���Ƥ���������\n"
+"Evolution "
+"�إ���ݡ��Ȥ������ե���������򤷤ơ��ꥹ�Ȥ���ե�������̤����򤷤Ƥ�������"
+"��\n"
 "\n"
-"�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
-"���礦"
+"�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution "
+"�ϲ����ߤ�Ǥ��礦"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
@@ -7575,54 +9673,19 @@ msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
 msgid "Closing connections..."
 msgstr "��³���Ĥ��Ƥ��ޤ�..."
 
-#: shell/e-shell-view.c:167
-msgid "(No folder displayed)"
-msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1383
-msgid "My Evolution"
-msgstr "My Evolution"
-
-#: shell/e-shell-view.c:1400
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution - %s"
-
-#: shell/e-shell-view.c:1402
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1440
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥�å�����"
-"��������"
-
-#: shell/e-shell-view.c:1447
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution �ϥ��ե饤�������Ǥ�"
-
-#: shell/e-shell-view.c:1453
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥�å�����"
-"��������"
-
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:232
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7634,35 +9697,92 @@ msgstr ""
 "���롼�ץ��������ץꥱ��������\n"
 "�ѥå��������եȤǤ�"
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "�ե�����ذ�ư..."
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "���������ե���������򤷤ޤ�"
 
-#: shell/e-shell-view-menu.c:653
-msgid "Work online"
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
+
+#: shell/e-shell-view-menu.c:584
+#, fuzzy
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "���������ե���������򤷤ޤ�"
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:665 shell/e-shell-view-menu.c:677
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "���ե饤����"
 
-#: shell/e-shortcuts.c:382
-msgid "Error saving shortcuts."
-msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
 
-#: shell/e-shortcuts-view.c:134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "My Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution - %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution "
+"�ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution �ϥ��ե饤�������Ǥ�"
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution "
+"�ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"`%s' �ӥ塼��������˴���ޤ��� :-(\n"
+"����Ϥ��֤� %s ����ݡ��ͥ�Ȥ�����å��夷�����Ȥ��̣���ޤ�"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "���롼��̾:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7671,110 +9791,204 @@ msgstr ""
 "�����˥��硼�ȥ��åȥС����饰�롼��\n"
 "`%s' �����������Ǥ���?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "������ޤ���"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "��������������(_S)"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "�礭����������(_L)"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "�������롼��(_N)..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "���Υ��롼�פ���(_R)..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "���Υ��롼�פ���(_R)..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "���硼�ȥ��åȥС��򱣤�(_H)"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "�����ƥ���"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "���Υ��硼�ȥ��åȤ򥢥��ƥ��֤ˤ��ޤ�"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "����"
+
+#: shell/e-shortcuts-view.c:474
+#, fuzzy
+msgid "Open the folder linked to this shortcut"
+msgstr "�̤Υ�����ɥ��Ǥ��Υե�����򳫤��ޤ�"
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "����������ɥ��dz���"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "����������ɥ������򤵤줿��å������򳫤��ޤ�"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "��͡���(_R)..."
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "���硼�ȥ��åȥС�(_S)"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "���󥿥���(_C)"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(̾���ʤ�)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "���顼�Ϥ���ޤ���"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O ���顼"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "���Ĥ�����ޤ���"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% ��λ(_l):"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "��³���Ĥ��Ƥ��ޤ�..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "�ۥ���:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "�ե����̾:"
@@ -7787,15 +10001,11 @@ msgstr "�ե��������:"
 msgid "Specify where to create the folder:"
 msgstr "�ե������������������ꤷ�Ƥ�������:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution ������"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
-"\"����ݡ���\" �򥯥�å����� Evolution �إե�����Υ���ݡ��Ȥ򳫻Ϥ��Ƥ���"
-"����"
+"\"����ݡ���\" �򥯥�å����� Evolution "
+"�إե�����Υ���ݡ��Ȥ򳫻Ϥ��Ƥ�������"
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Utility"
@@ -7815,30 +10025,34 @@ msgstr ""
 "���Υ��������ɤǤ� Evolution ����˳����ե�����򥤥�ݡ���\n"
 "����������̤��ư��⤷�ޤ�"
 
-#: shell/importer/intelligent.c:187
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "����ݡ���"
 
-#: shell/importer/intelligent.c:193
+#: shell/importer/intelligent.c:197
 msgid "Don't import"
 msgstr "����ݡ��Ȥ��ޤ���"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "���Υ�å����������٤�ɽ�����ʤ�"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7859,7 +10073,7 @@ msgstr ""
 "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
 "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7867,34 +10081,29 @@ msgstr ""
 "���꤬�Ȥ�\n"
 "Evolution ������\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Evolution ������ν����������ޤ���"
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "���ץ�å�����̤�̵���ˤ���"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "�ڤ���(_u)"
-
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-mail.xml.h:8 ui/evolution-task-editor-dialog.xml.h:14
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "���ԡ�"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "���򤵤줿��Τ򥳥ԡ����ޤ�"
 
@@ -7902,68 +10111,66 @@ msgstr "���򤵤줿��Τ򥳥ԡ����ޤ�"
 msgid "Create new contact"
 msgstr "�������󥿥��Ȥ�������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:15
-#: ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "�������󥿥��Ȥ�������ޤ�"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "�ڤ���"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-event-editor.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "���򤵤줿��Τ��ڤ���ޤ�"
 
-#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "���򤷤����󥿥��Ȥ������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "�������󥿥���"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:30
-#: ui/evolution-task-editor-dialog.xml.h:33
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "�˥塼��"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "Ž���դ�"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:31
-#: ui/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:68
-msgid "Previews the message to be printed"
-msgstr "����������å������Υץ�ӥ塼��ɽ�����ޤ�"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "��������륫�����Υץ�ӥ塼��ɽ�����ޤ�"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "���򤷤����󥿥��Ȥ�������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-event-editor.xml.h:48
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "���٤�����"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "���٤ƤΤ�Τ����򤷤ޤ�"
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "���٤ƤΥ��󥿥��Ȥ�ɽ�����ޤ�"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "���"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "View All"
-msgstr "���٤�ɽ��"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "View all contacts"
-msgstr "���٤ƤΥ��󥿥��Ȥ�ɽ�����ޤ�"
-
 #: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "���ɥ쥹Ģ�Υ�����(_A)..."
@@ -7972,183 +10179,223 @@ msgstr "���ɥ쥹Ģ�Υ�����(_A)..."
 msgid "_Contact"
 msgstr "���󥿥���(_C)"
 
-#: ui/evolution-addressbook.xml.h:24 ui/evolution-event-editor.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "���ԡ�(_C)"
-
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-event-editor.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Ž���դ�(_P)"
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "���󥿥���(_C)"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "����(_P)..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "���󥿥��Ȥθ���(_S)"
 
-#: ui/evolution-addressbook.xml.h:28 ui/evolution-event-editor.xml.h:72
-#: ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "���٤�����(_A)"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "�ġ���(_T)"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 ��"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "�����������Υ��٥�Ȥ�������ޤ�"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "������«��������ޤ�"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "������������������ޤ�"
+msgid "Create a new appointment"
+msgstr "������«��������ޤ�"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "��"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "��ư"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "���֤��ᤷ�ޤ�"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "���֤�ʤ�ޤ�"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "�������˰�ư(_D)"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "�����ذ�ư(_T)"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "�������˰�ư���ޤ�"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "���ߤλ��֤ذ�ư���ޤ�"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "��"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "�������٥��(_E)"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "�������򳫤�"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "��"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "������«"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "��������륫�����Υץ�ӥ塼��ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "���������"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "���Υ������ΰ������ޤ�"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "��̾����¸"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "ɬ�ܾ���"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "�̤Τ�ΤȤ��ƥ���������¸���ޤ�"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 ����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 �����ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "1 ���֤�ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "����ϫƯ���֤�ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "����"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "����ϫƯ����(_o)"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "��"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "��«(_A)"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "�᡼������(_M)..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "��(_D)"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "��(_M)"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
-msgid "_New"
-msgstr "����(_N)"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "�������򳫤�(_O)"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "��(_W)"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "�Ĥ���"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "������«���Ĥ��ޤ�"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "������«����"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "�ᥤ��ġ���С�"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "����������å������Υץ�ӥ塼��ɽ�����ޤ�"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "�����ץ�ӥ塼(_v)"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "�ץ�󥿤�����"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "���Υ����ƥ�����"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "����..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "��¸���Ĥ���"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "��«����¸���ƥ����������ܥå������Ĥ��ޤ�"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "%s �إӥ塼���ѹ�"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "���ߤΥץ�󥿤Υڡ��������Ԥ��ޤ�"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "ư��(_A)"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "�ե�����(_F)"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "���Υ����ƥ�������ޤ�"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "���..."
 
@@ -8160,27 +10407,12 @@ msgstr "�إ��"
 msgid "Print En_velope..."
 msgstr "ɽ������(_v)..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "���Υ����ƥ�����"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "����..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "��̾����¸(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "��¸���Ĥ���"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "���󥿥��Ȥ���¸���Ƥ��Υ����������ܥå������Ĥ��ޤ�"
@@ -8197,670 +10429,672 @@ msgstr "����饤��إ�פ򻲾Ȥ��Ƥ�������"
 msgid "Send _message to contact..."
 msgstr "���󥿥��Ȥإ�å�����������(_m)..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
-msgid "_File"
-msgstr "�ե�����(_F)"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "��¸(_S)"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "���Υ��ץꥱ�������ˤĤ���"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "���Υ����ƥ�������ޤ�"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "����..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "����������¸���ƥ����������ܥå������Ĥ��ޤ�"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "ư��(_n)"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "¾�إ��󥿥��Ȥ�����(_n)..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "���ɥ쥹Ģ(_B)... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "���󥿥��Ȥإ�å�����������(_m)..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "���ꥢ(_l)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "�ǹ礻�򥭥�󥻥�"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "̾���Υ����å� (_k) (FIXME)"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "���Υե������������ѹ����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "���ꥢ"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "vCalender�Ȥ���ž��(_C) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "���򤵤줿��Τ򥯥ꥢ���ޤ�"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "���Υ�å�������ž�����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "������«���Ĥ��ޤ�"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "�ե�����إ��ԡ�(_y)... (FIXME)"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"�׵�\n"
+"�ǹ礻"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "������«����"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "�ǹ礻�Υ������塼��(_M)"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML�����"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "�ǹ礻�Υ������塼��"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "UI XML �ε��Ҥ����פ��ޤ�"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "ư��(_A)"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "�ե�����κǽ�Υ����ƥ�(_r) (FIXME)"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
+msgstr "My Evolution �Υ������ޥ���"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "ž��(_w) (FIXME)"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "����󥻥�"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "vCalender�Ȥ���ž��(_C) (FIXME)"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "���Υ����ƥ�ذ�ư���ޤ�"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "����"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "���Υ����ƥ�ذ�ư���ޤ�"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "��å�������������ޤ�"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "̤��λ������(_c) (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "�ե�����Υץ��ѥƥ��������ޤ�"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "�����᡼���ե��륿����롼��κ���/�Խ��򤷤ޤ�"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "��(_e)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr "���ۥե��������������/�Խ����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "��(_v)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "����Ȣ����ˤ���(_T)"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "�����ץ�ӥ塼(_v)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "�ѥ���ɤ�ʶ��(_P)"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "�ץ�󥿤�����(_e)..."
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "���������ѥ���ɤ�˺�줿���˺Ƥ�ɽ�����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "�ץ�󥿤�����"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "������ɴ���(_S)..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "��¸"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr "�᡼���������뤿��˥�����ɥ��򳫤��ޤ�"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "��«����¸���ƥ����������ܥå������Ĥ��ޤ�"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "���٤ƤΥե�����������ޡ������줿��å�������ʵ�Ū�˺�����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "���ߤΥե��������¸���ޤ�"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "������"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "�ǹ礻�Υ������塼��(_M)"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "���塼�ˤ���᡼����������ƿ����᡼���������ޤ�"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "�̾�Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "���ߤΥץ�󥿤Υڡ��������Ԥ��ޤ�"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "�����о�Υե�����ι���/���ɲ���򤷤ޤ�"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "�������׵�(_R) (FIXME)"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "���ۥե�������ǥ���(_E)..."
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "����(_A)..."
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "�ե��륿(_F)..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "�Ĥ���(_C)"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "��å�������᡼��(_M)"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:45
-msgid "_Contact (FIXME)"
-msgstr "���󥿥���(_C) (FIXME)"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "�᡼������(_M)..."
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "�ǥХå�(_D)"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "�ץ�ӥ塼"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "�إ��(_H)"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "������(_S)"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "�����ƥ�(_I) (FIXME)"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "���Υե������������ѹ����ޤ�"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "��������(_J) (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "���򤵤줿��å������򱣤�(_e)"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "�ե�����κǸ�Υ����ƥ�(_L) (FIXME)"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "���򤵤줿��å�������������ޤ�"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "��å�������᡼��(_M) (FIXME)"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "���򤵤줿��å������򱣤�(_e)"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "�ե�����ذ�ư(_M)... (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "������줿��å������򱣤�(_D)"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "����(_N) (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "���ɥ�å������򱣤�(_R)"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:120
-#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "�ץ��ѥƥ�(_P)..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "ɽ�����Ƥ����å������ǤϤʤ�������줿��å������򱣤��ޤ�"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:63
-msgid "_Task (FIXME)"
-msgstr "������(_T) (FIXME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "���ɤȤ��Ƥ��٤ƥޡ���(_e)"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "̤�ɥ����ƥ�(_U) (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "���ɤȤ��Ƥ��٤ƤΥ�å�������ޡ������ޤ�"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "ɽ��(_V)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr "My Evolution �Υ������ޥ���"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "���Υե�����������ޡ������줿��å�������ʵ�Ū�˺�����ޤ�"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "���򤵤줿��å������إե��륿�롼���Ŭ�Ѥ��ޤ�"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "���٤�����(_A)"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "����󥻥�"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "����åɤ�����(_T)"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Cancel the current mail operation"
-msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr "�������򤵤�Ƥ��ʤ���å����������򤹤٤����򤷤ޤ�"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr "���Υե������������ѹ����ޤ�"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr "���򤵤줿��å�������Ʊ������åɤΥ�å������򤹤٤����򤷤ޤ�"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "����"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "���٤ƤΥ�å����������򤷤ޤ�"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "���٤�ɽ��(_A)"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "���Ū�˱�������å�������ɽ�����ޤ�"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "���٤Ƥδ��ɥ�å���������Ū�˱����ޤ�"
+
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "���򤵤줿��å���������Ū�˱����ޤ�"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "����(_E)"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "�ե����(_F)"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "�����ȿž(_I)"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "�ץ��ѥƥ�(_P)..."
+
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "��å������ꥹ�Ȥ򥹥�åɲ�(_T)"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "���򤵤줿��å������إե��륿�롼���Ŭ�Ѥ��ޤ�"
+
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "���򤵤줿��å������μ����������ؤ��ֿ���������ޤ�"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "���򤵤줿��å������������Ԥؤ��ֿ���������ޤ�"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "���򤵤줿��å������������Ԥؤ��ֿ���������ޤ�"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "�̤Υե���������򤵤줿��å������򥳥ԡ����ޤ�"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "��å��������鲾�ۥե���������(_V)"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "���������Ԥ���Υ�å�������ե��륿����롼���������ޤ�"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "�����μ����ԤؤΥ�å�������ե��륿����롼���������ޤ�"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "���Υ᡼��󥰥ꥹ�ȤؤΥ�å�������ե��륿����롼���������ޤ�"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "���η�̾�Υ�å�������ե��륿����롼���������ޤ�"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "�����μ����ԤΤ���β��ۥե������������ޤ�"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "���Υ᡼��󥰥ꥹ�ȤΤ���β��ۥե������������ޤ�"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "���������ԤΤ���β��ۥե������������ޤ�"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "���η�̾�Τ���β��ۥե������������ޤ�"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr "�᡼�륢������Ȥ�¾����������/�Խ����ޤ�"
-
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr "�����᡼���ե��륿����롼��κ���/�Խ��򤷤ޤ�"
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr "���ۥե��������������/�Խ����ޤ�"
-
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "����̤�ɥ���åɤ�ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "���ν��פʥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "���Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Empty _Trash"
-msgstr "����Ȣ����ˤ���(_T)"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_L)"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "�����ԤΥե��륿(_n)"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "�����ԤΥե��륿(_R)"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "��̾�Υե��륿(_S)"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "����Ū�� HTML �᡼��β������ɤ߹���"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Forget _Passwords"
-msgstr "�ѥ���ɤ�ʶ��(_P)"
-
-#: ui/evolution-mail.xml.h:37
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "���������ѥ���ɤ�˺�줿���˺Ƥ�ɽ�����ޤ�"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "ž��"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "ž��"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "ź�դ���ž��(_A)"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "����饤���ž��(_I)"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "���Ѥ���ž��(_Q)"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "������å���������ʸ��������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "���Ѥ������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "ï�������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ź�դȤ���ï�������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Hide S_elected Messages"
-msgstr "���򤵤줿��å������򱣤�(_e)"
-
-#: ui/evolution-mail.xml.h:48
-msgid "Hide _Deleted Messages"
-msgstr "������줿��å������򱣤�(_D)"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Hide _Read messages"
-msgstr "���ɥ�å������򱣤�(_R)"
-
-#: ui/evolution-mail.xml.h:50
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "ɽ�����Ƥ����å������ǤϤʤ�������줿��å������򱣤��ޤ�"
-
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "�������ɤ߹���(_I)"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Manage _Subscriptions..."
-msgstr "������ɴ���(_S)..."
-
-#: ui/evolution-mail.xml.h:53
-msgid "Mar_k As Read"
-msgstr "���ɤȤ��ƥޡ���(_k)"
-
-#: ui/evolution-mail.xml.h:54
-msgid "Mark All as R_ead"
-msgstr "���ɤȤ��Ƥ��٤ƥޡ���(_e)"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "����"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "̤�ɤȤ��ƥޡ���(_n)"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Mark all visible messages as read"
-msgstr "���ɤȤ��Ƥ��٤ƤΥ�å�������ޡ������ޤ�"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "���ɤȤ������򤵤줿��å�������ޡ������ޤ�"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "̤�ɤȤ������򤵤줿��å�������ޡ������ޤ�"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "���򤵤줿��å������˺���ޡ����򤷤ޤ�"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "��ư"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "�̤Υե���������򤵤줿��å��������ư���ޤ�"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "�᡼���������뤿��˥�����ɥ��򳫤��ޤ�"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "��"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "���Υ�å������ذ�ư���ޤ�"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "���Υ�å������ذ�ư���ޤ�"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "����åɤ�����(_T)"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "���Υ�å������ذ�ư���ޤ�"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "����������ɥ������򤵤줿��å������򳫤��ޤ�"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "���򤵤줿��å������򥳥�ݡ����dz����������ޤ�"
 
-#: ui/evolution-mail.xml.h:66
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "���٤ƤΥե�����������ޡ������줿��å�������ʵ�Ū�˺�����ޤ�"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "����������å������Υץ�ӥ塼��ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "���Υե�����������ޡ������줿��å�������ʵ�Ū�˺�����ޤ�"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "��"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "���Υ�å������ذ�ư���ޤ�"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "���Υ�å������ذ�ư���ޤ�"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "���Υ�å������ذ�ư���ޤ�"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "�����������..."
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "�����ץ�ӥ塼..."
 
-#: ui/evolution-mail.xml.h:73
-msgid "Print message to the printer"
-msgstr "��å�������ץ�󥿤ذ������ޤ�"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "�����������"
 
-#: ui/evolution-mail.xml.h:74
-msgid "Redirect (FIXME: implement me)"
-msgstr "��̾��񤭴����� (FIXME: �������Ƥ�������)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "�ֿ�"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "�������ֿ�"
+
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "��å������򸡺�(_e)"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "�ƥ����ȥե�����إ�å���������¸���ޤ�"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: ui/evolution-mail.xml.h:81 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "���٤�����(_A)"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Select _Thread"
-msgstr "����åɤ�����(_T)"
-
-#: ui/evolution-mail.xml.h:83
-msgid "Select all and only the messages that are not currently selected"
-msgstr "�������򤵤�Ƥ��ʤ���å����������򤹤٤����򤷤ޤ�"
-
-#: ui/evolution-mail.xml.h:84
-msgid "Select all messages in the same thread as the selected message"
-msgstr "���򤵤줿��å�������Ʊ������åɤΥ�å������򤹤٤����򤷤ޤ�"
-
-#: ui/evolution-mail.xml.h:85
-msgid "Select all visible messages"
-msgstr "���٤ƤΥ�å����������򤷤ޤ�"
-
-#: ui/evolution-mail.xml.h:86
-msgid "Send / Receive"
-msgstr "������"
-
-#: ui/evolution-mail.xml.h:87
-msgid "Send queued mail and retrieve new mail"
-msgstr "���塼�ˤ���᡼����������ƿ����᡼���������ޤ�"
-
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "�᡼��Υ�������ɽ��(_S)"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "���٤ƤΥإå���ɽ��(_H)"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Show _All"
-msgstr "���٤�ɽ��(_A)"
-
-#: ui/evolution-mail.xml.h:91
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "�̾�Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "���٤ƤΥ᡼��إå���ޤ�ƥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Show messages that have been temporarily hidden"
-msgstr "���Ū�˱�������å�������ɽ�����ޤ�"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "��å������Υ�������ɽ�����ޤ�"
 
-#: ui/evolution-mail.xml.h:95
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "�����о�Υե�����ι���/���ɲ���򤷤ޤ�"
-
-#: ui/evolution-mail.xml.h:96
-msgid "Temporarily hide all messages that have already been read"
-msgstr "���٤Ƥδ��ɥ�å���������Ū�˱����ޤ�"
-
-#: ui/evolution-mail.xml.h:97
-msgid "Temporarily hide the selected messages"
-msgstr "���򤵤줿��å���������Ū�˱����ޤ�"
-
-#: ui/evolution-mail.xml.h:98
-msgid "Threaded Message list"
-msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
-
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "���򤵤줿��å������������ä��ޤ�"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)..."
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "�����Ԥβ��ۥե����(_n)..."
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "�����Ԥβ��ۥե����(_R)..."
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "��̾�β��ۥե����(_S)..."
 
-#: ui/evolution-mail.xml.h:104
-msgid "Virtual Folder _Editor..."
-msgstr "���ۥե�������ǥ���(_E)..."
-
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "�ե��륿Ŭ��(_A)"
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "�ե�����إ��ԡ�(_C)"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "��å���������ե��륿�����(_C)"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Expunge"
-msgstr "����(_E)"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Filters..."
-msgstr "�ե��륿(_F)..."
-
-#: ui/evolution-mail.xml.h:111 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "�ե����(_F)"
-
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "��å�������ž��(_F)"
 
-#: ui/evolution-mail.xml.h:113 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "�����ȿž(_I)"
-
-#: ui/evolution-mail.xml.h:114
-msgid "_Mail Message"
-msgstr "��å�������᡼��(_M)"
-
-#: ui/evolution-mail.xml.h:115
-msgid "_Mail Settings..."
-msgstr "�᡼������(_M)..."
-
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: ui/evolution-mail.xml.h:117
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "�ե�����ذ�ư(_M)"
 
-#: ui/evolution-mail.xml.h:118
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "�̾�ɽ��(_N)"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "��å������򳫤�(_O)"
 
-#: ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "�������������(_R)"
 
-#: ui/evolution-mail.xml.h:124
-msgid "_Send / Receive"
-msgstr "������(_S)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "���Υ�����ɥ����Ĥ��ޤ�"
 
-#: ui/evolution-mail.xml.h:125
-msgid "_Threaded Message List"
-msgstr "��å������ꥹ�Ȥ򥹥�åɲ�(_T)"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "�ġ���С��Υ������ޥ���(_z)..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "�������ޥ���"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "�ġ���С��򥫥����ޥ������ޤ�"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "�Ĥ���(_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "ɽ��(_V)"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "ź��"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "���ߤΥե�������Ĥ��ޤ�"
 
@@ -8885,45 +11119,60 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "�ƥ����ȥե����������..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "��å������إƥ����ȤȤ��ƥե�������������ޤ�"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "�ƥ����ȥե����������..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "�ե�����򳫤�"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP �ˤ��Ź沽"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP ������"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME �ˤ��Ź沽"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME ��̾"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "��Ƥ���¸(_D)"
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "��¸"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "��̾����¸"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "�ե��������¸... (FIXME)"
+msgid "Save _Draft"
+msgstr "��Ƥ���¸(_D)"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "�ե��������¸..."
 
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "���ߤΥե��������¸���ޤ�"
+
 #: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "���ߤΥե��������̾����¸���ޤ�"
@@ -8993,162 +11242,136 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "�ֿ���ե�����ɤ�ɽ�����뤫�ɤ������ؤ��ޤ�"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "ź�դ��ɲ�..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Bcc �ե������(_B)"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Cc �ե������(_C)"
 
 #: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "�ǥХå�(_D)"
+
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "���٤ƺ��(_D)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "���пͥե������(_F)"
 
 #: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "����(_I)"
 
 #: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "�ƥ����ȥե����������(_I)... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "����(_O)..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "�ֿ���ե������(_R)"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "�������ƥ�(_S)"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "�إ��(_H)"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "���ɥե�����Υꥹ�Ȥإե�������ɲ�"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "�ե����(_o)"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "�ꥹ�Ȥ򹹿�"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "�ե�����ꥹ�Ȥ򹹿�"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "���ɥե�����Υꥹ�Ȥ���ե��������"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "����"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "���ɲ��"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "�����������(_n) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "����"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "�Ƹ���"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "�ǹ礻�׵�(_q) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "���ľ��"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "̤��λ��ư�����ľ���ޤ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "�ִ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "ʸ�����ִ����ޤ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "�������ֿ�(_l) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "�������ơ�������ݡ���(_e) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "������򥹥��å�(_k) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "����������¸���ƥ����������ܥå������Ĥ��ޤ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Ʊ��ʸ����ǺƸ�����Ԥ��ޤ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "ʸ����Ǹ������ޤ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "�����᤹"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "����󥻥�"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "�Ǹ��ư��򸵤��ᤷ�ޤ�"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "���Υ������������ޤ�"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:43
-msgid "_Appointment (FIXME)"
-msgstr "��«(_A) (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "�ꥹ�Ȥ򹹿�"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "��λ��ޡ��� (_M) (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "�ֿ�(_R) (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "���򤷤��������������ޤ�"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "������������������ޤ�"
 
 #: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "���򤷤��������������ޤ�"
+
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "���򤷤��������������ޤ�"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "����������"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "�̤Τ�ΤȤ��ƥ���������¸���ޤ�"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Tasks Preferences..."
-msgstr "������������..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "�᡼������(_M)..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "������(_T)"
 
@@ -9164,202 +11387,193 @@ msgstr "���硼�ȥ��åȥС����ɲ�(_S)"
 msgid "Change the name of this folder"
 msgstr "���Υե������̾�����ѹ����ޤ�"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "���Υե������������ѹ����ޤ�"
-
 #: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "���Υ�����ɥ����Ĥ��ޤ�"
-
-#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "�ե�����򥳥ԡ����ޤ�"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "�����ե���������(_N)..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "���硼�ȥ��åȥС��ˤ��Υե�����Υ�󥯤�������ޤ�"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "�����ե������������ޤ�"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "�ġ���С��Υ������ޥ���(_z)..."
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "�������ޥ���"
-
 #: ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "�ġ���С��򥫥����ޥ������ޤ�"
-
-#: ui/evolution.xml.h:14
 msgid "Delete this folder"
 msgstr "���Υե�����������ޤ�"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "�̤Υե������ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "��λ(_x)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution ������ɥ�(_W)"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolution �С����硼�ȥ��å�(_s)"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "�ץ�������λ���ޤ�"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "�Ϥ��(_S)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "�����ե���������򥤥�ݡ��Ȥ��ޤ�"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "�ᥤ��ġ���С�"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "�̤ξ��ؤ��Υե�������ư���ޤ�"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "����������ɥ��dz���"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "����������ɥ��dz���(_W)"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "�̤Υ�����ɥ��Ǥ��Υե�����򳫤��ޤ�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "�Զ���������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "�Զ���������(_B)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddy��Ȥä��Զ��������Ф��ޤ�"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "���ؤ�"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "���硼�ȥ��åȥС���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "���ե饤���Ȥ��ɤ��������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "���󥿥��ȥޥ͡������Ȥ�(_o)"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "��������Ȥ�(_C)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "�᡼���Ȥ�(_M)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "���򤵤줿�ե������ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "���ե饤����"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Evolution �ˤĤ���(_A)..."
 
-#: ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "ư��(_A)"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "��«(_A) (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "���󥿥���(_C) (FIXME)"
+
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "���ԡ�(_C)..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "�ե�����С�(_F)"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "�ե�����򥤥�ݡ���(_I)..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "����ǥå���(_I)"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "��å�������᡼��(_M)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "��ư(_M)..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "����(_N)"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "�����ե����(_N)"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "��͡���(_R)..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "���硼�ȥ��åȥС�(_S)"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "������(_T) (FIXME)"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
+#: ui/my-evolution.xml.h:1
+#, fuzzy
+msgid "Change the settings for My Evolution"
+msgstr "���Υե������������ѹ����ޤ�"
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "�᡼������(_M)..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "���ɥ쥹������"
@@ -9392,9 +11606,12 @@ msgstr "������"
 msgid "With Category"
 msgstr "���ƥ���"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "����"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%Yǯ %m�� %d�� %A"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9468,13 +11685,6 @@ msgstr "��Ľ�λ����(_e):"
 msgid "All Attendees"
 msgstr "���٤Ƥ��դ�ź��"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%Yǯ %m�� %d�� %A"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "���ߤ�ɽ��(_C)"
@@ -9485,53 +11695,129 @@ 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "��"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "����"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "���֤ϥե����ޥåȤ�����ʤ���Фʤ�ޤ���: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "����"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "��"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "����Ȣ"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "�����ϼ��Ԥ��ޤ���"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "�˥塼��"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "̤�ΤΥ��顼: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "�ǥե���ȤΥ���饯�����å�: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "����¾"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "���󥿥��ȥ��ǥ���"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "��������¸"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "��鸡��"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "��̾����¸..."
-
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "���٤�ɽ��"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "�Խ�..."
-
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
@@ -9543,6 +11829,10 @@ msgstr "����"
 msgid "Warning"
 msgstr "�ٹ�"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "���顼"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "����"
@@ -9579,3 +11869,541 @@ msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "������������..."
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "������������..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "���󥿥���(_o)..."
+
+#~ msgid "_Company:"
+#~ msgstr "���(_C):"
+
+#~ msgid "Find..."
+#~ msgstr "����..."
+
+#~ msgid "Open calendar"
+#~ msgstr "�������򳫤�"
+
+#~ msgid "Save calendar"
+#~ msgstr "����������¸"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>���������������˥��顼:<br>�᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
+
+#~ msgid "Settings..."
+#~ msgstr "����..."
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "������ָ�˥��顼�ब�����ॢ����"
+
+#~ msgid "Colors"
+#~ msgstr "���顼"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "���顼����ߤ�ͭ��"
+
+#~ msgid "Highlight"
+#~ msgstr "��Ĵ"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "���������¤Υ����ƥ�:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "�ޤ����¤ǤϤʤ������ƥ�"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "�ޤ����¤ǤϤʤ������ƥ�:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "���¤�᤮�������ƥ�:"
+
+#~ msgid "TaskPad"
+#~ msgstr "�������ѥå�"
+
+#~ msgid "Time Until Due"
+#~ msgstr "���¤ޤǤλ���"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "��Х��顼��"
+
+#~ msgid "Work week"
+#~ msgstr "����ϫƯ����"
+
+#~ msgid "Percent complete"
+#~ msgstr "�ѡ�����ȴ�λ"
+
+#~ msgid "Edit this task"
+#~ msgstr "���Υ��������Խ����ޤ�"
+
+#~ msgid "Go to Today"
+#~ msgstr "�����ذ�ư"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "���٤Ƥν��������"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "����ݡ��ͥ�Ȥ���������������ޤ���"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "�������ե����������ɤ��뤳�Ȥ�����ޤ���Ǥ���!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "�������ե�������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "����Ͼ�������ï��������ֻ��Ǥ�!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "��¸�����������򹹿�����ޤ���Ǥ���"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "����������ݡ��ͥ�Ȥ�������ޤ���Ǥ���!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "����ݡ��ͥ�Ȥ��������������ޤ���"
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "���Υ���������ݡ��ͥ�Ȥμ��̤�ǧ�����ޤ���"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "���������ɲ�"
+
+#~ msgid " Tentative "
+#~ msgstr " ���� "
+
+#~ msgid "Update Calendar"
+#~ msgstr "�������򹹿�"
+
+#~ msgid "Attendee address"
+#~ msgstr "���ʼԤν���"
+
+#~ msgid "Attendees: "
+#~ msgstr "���ʼ�: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "����󥻥�\n"
+#~ "�ǹ礻"
+
+#~ msgid "Organizer: "
+#~ msgstr "��ż�:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "ȯɽ\n"
+#~ "���٥��"
+
+#~ msgid "Summary contains"
+#~ msgstr "���ޥ꤬���Τ�Τ�ޤ�"
+
+#~ msgid "Comment contains"
+#~ msgstr "�����Ȥ����Τ�Τ�ޤ�"
+
+#~ msgid "Has category"
+#~ msgstr "���Υ��ƥ�������"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "%s �Υ��å��ե������ƥ��Ƚ���ޤ���Ǥ���: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP �ե������������"
+
+#~ msgid "Inline attachment"
+#~ msgstr "����饤���ź��"
+
+#~ msgid "Send as:"
+#~ msgstr "������:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "��̾�ե����� %s �򳫤����Ȥ�����ޤ���Ǥ���:\n"
+#~ "%s"
+
+#~ msgid "That file does not exist."
+#~ msgstr "���Υե������¸�ߤ��ޤ���"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "������̾�Υե�����ǤϤ���ޤ���"
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "���Υե������¸�ߤ��ޤ������ɤ߼���ǽ�ǤϤ���ޤ���"
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "���Υե�����ϥ���������ǽ�Τ褦�˸����ޤ�����open(2) �ϼ��Ԥ��ޤ���"
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "�ե�����ϤȤƤ��礭�� (100K �ʾ�) �Ǥ�\n"
+#~ "�����ˤ�����������뤳�Ȥ�˾�ߤޤ���?"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML �ե�����򳫤����Ȥ�����ޤ���:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "�ǡ����Ӥ߹�����˥��顼:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "�ե�����ϥ����ӥ��ξ�����äƤ��ޤ���\n"
+
+#~ msgid "Select a service"
+#~ msgstr "�����ӥ�������"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "�¹ԥ��ޥ꡼���ط�����̡���HTML�ڡ��������򤹤뤳�Ȥ�����ޤ�\n"
+#~ "\n"
+#~ "�ǥե���Ȥ϶���Ǥ�"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "�ǥե���Ȥ�GNOME���ץꥱ�������� %s �򳫤�"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "�ǥե���Ȥ�GNOME�����֥֥饦���� %s �򳫤�"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s ����᡼�������"
+
+#~ msgid "Run %s"
+#~ msgstr "%s ��¹�"
+
+#~ msgid "Close %s"
+#~ msgstr "%s ���Ĥ���"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "���� %s ���ư"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "���� %s ���ư"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "���������� %s ���ư"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "���������� %s ���ư"
+
+#~ msgid "Configure %s"
+#~ msgstr "%s ������"
+
+#~ msgid "page"
+#~ msgstr "�ڡ���"
+
+#~ msgid "Appearance"
+#~ msgstr "����"
+
+#~ msgid "Background:"
+#~ msgstr "�ط�:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "�¹ԥ��ޥ꡼����ݡ��ͥ�Ȥ� Bonobo ����������ޤ���Ǥ���\n"
+#~ "�⤷ RootPOA �ˤĤ��Ƥηٹ��å�����������ʤ顤���֤� OAF �������\n"
+#~ "GOAD ��Ȥäƥ���ѥ��뤷�����Ȥ��̣���ޤ�"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF ���ޥ�Τ���Υե����ȥ�"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ���ޥ�"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "�ƥ��� Bonobo ����ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#~ msgid "Factory for the test component."
+#~ msgstr "�ƥ��ȥ���ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#~ msgid "Test bonobo service"
+#~ msgstr "�ƥ��� Bonobo �����ӥ�"
+
+#~ msgid "Test service"
+#~ msgstr "�ƥ��ȥ����ӥ�"
+
+#~ msgid "Update automatically"
+#~ msgstr "��ưŪ�˹���"
+
+#~ msgid "Forward to Address"
+#~ msgstr "���ɥ쥹��ž��"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm �����ꥢ��"
+
+#~ msgid "Addressbooks"
+#~ msgstr "���ɥ쥹Ģ"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����ޤ�"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "�ե�����κƹ�����"
+
+#~ msgid "Closing current folder"
+#~ msgstr "���ߤΥե�����򥯥�������"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "�Ť��ե�������͡��ष�ƥ����ץ���"
+
+#~ msgid "Creating new folder"
+#~ msgstr "�����ե�����������"
+
+#~ msgid "Copying messages"
+#~ msgstr "��å������򥳥ԡ���"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution �ʹ�"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "%s ���� %s �إե�������ư��"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "%s ���� %s �إե�����򥳥ԡ���"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "��å������ֹ� %d / %d (uid \"%s\") �������"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "��å����� %d / %d (uid \"%s\") ����¸��"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "�ѥ��׾���Դ����ʥ�å��������񤫤�ޤ���!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (��å�������ž��)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (��̾�ʤ�)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "��å�������ž�����ޤ��� (��̾�ʤ�)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "��å������������Ԥ��ֿ����ޤ�"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "���Υ�å������μ������������ֿ����ޤ�"
+
+#~ msgid "Delete this message"
+#~ msgstr "���Υ�å������������ޤ�"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution �Υե���������������󥹥ȡ��뤵��ޤ���"
+
+#~ msgid "Activate"
+#~ msgstr "�����ƥ���"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "���Υ��硼�ȥ��åȤ򥢥��ƥ��֤ˤ��ޤ�"
+
+#~ msgid "Select everything"
+#~ msgstr "���٤ƤΤ�Τ����򤷤ޤ�"
+
+#~ msgid "View All"
+#~ msgstr "���٤�ɽ��"
+
+#~ msgid "5 Days"
+#~ msgstr "5 ��"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "������������������ޤ�"
+
+#~ msgid "Day"
+#~ msgstr "��"
+
+#~ msgid "New _Event"
+#~ msgstr "�������٥��(_E)"
+
+#~ msgid "Open Calendar"
+#~ msgstr "�������򳫤�"
+
+#~ msgid "Prev"
+#~ msgstr "��"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "�̤Τ�ΤȤ��ƥ���������¸���ޤ�"
+
+#~ msgid "Week"
+#~ msgstr "��"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "�������򳫤�(_O)"
+
+#~ msgid "About this application"
+#~ msgstr "���Υ��ץꥱ�������ˤĤ���"
+
+#~ msgid "About..."
+#~ msgstr "����..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "ư��(_n)"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "���ɥ쥹Ģ(_B)... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "���ꥢ(_l)"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "̾���Υ����å� (_k) (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "�ե�����إ��ԡ�(_y)... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "XML�����"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "UI XML �ε��Ҥ����פ��ޤ�"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "�ե�����κǽ�Υ����ƥ�(_r) (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "ž��(_w) (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "���Υ����ƥ�ذ�ư���ޤ�"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "���Υ����ƥ�ذ�ư���ޤ�"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "̤��λ������(_c) (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "��(_e)"
+
+#~ msgid "Pre_vious"
+#~ msgstr "��(_v)"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "�ץ�󥿤�����(_e)..."
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "�������׵�(_R) (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "����(_A)..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "�����ƥ�(_I) (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "�ե�����κǸ�Υ����ƥ�(_L) (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "��å�������᡼��(_M) (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "�ե�����ذ�ư(_M)... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "����(_N) (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "̤�ɥ����ƥ�(_U) (FIXME)"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "���ɤȤ��ƥޡ���(_k)"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "̤�ɤȤ��ƥޡ���(_n)"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "��å�������ץ�󥿤ذ������ޤ�"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "��̾��񤭴����� (FIXME: �������Ƥ�������)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "�ե��������¸... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "�ƥ����ȥե����������(_I)... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "�����������(_n) (FIXME)"
+
+#~ msgid "Find"
+#~ msgstr "����"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "�ǹ礻�׵�(_q) (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "���ľ��"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "̤��λ��ư�����ľ���ޤ�"
+
+#~ msgid "Replace"
+#~ msgstr "�ִ�"
+
+#~ msgid "Replace a string"
+#~ msgstr "ʸ�����ִ����ޤ�"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "�������ֿ�(_l) (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "�������ơ�������ݡ���(_e) (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "������򥹥��å�(_k) (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Ʊ��ʸ����ǺƸ�����Ԥ��ޤ�"
+
+#~ msgid "Search for a string"
+#~ msgstr "ʸ����Ǹ������ޤ�"
+
+#~ msgid "Undo"
+#~ msgstr "�����᤹"
+
+#~ msgid "Undo the last action"
+#~ msgstr "�Ǹ��ư��򸵤��ᤷ�ޤ�"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "��λ��ޡ��� (_M) (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "�ֿ�(_R) (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution �С����硼�ȥ��å�(_s)"
diff --git a/po/ko.po b/po/ko.po
index 115a7e4390..1926174eff 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-03-23 01:31+0900\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-03-23 02:12+0900\n"
 "Last-Translator: ChiDeok, Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -16,11 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3255
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "ī��: "
 
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -28,37 +38,37 @@ msgstr ""
 "\n"
 "�̸�: "
 
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -66,7 +76,7 @@ msgstr ""
 "\n"
 "����: "
 
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -74,25 +84,25 @@ msgstr ""
 "\n"
 "�ּ�:"
 
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -100,7 +110,7 @@ msgstr ""
 "\n"
 "  ��/��:          "
 
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -108,7 +118,7 @@ msgstr ""
 "\n"
 "  ����:        "
 
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -116,7 +126,7 @@ msgstr ""
 "\n"
 "  ���� ��ȣ:   "
 
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -124,13 +134,13 @@ msgstr ""
 "\n"
 "  ����:        "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -138,7 +148,7 @@ msgstr ""
 "\n"
 "��ȭ��ȣ:\n"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -146,7 +156,7 @@ msgstr ""
 "\n"
 "��ȭ��ȣ:"
 
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -154,7 +164,7 @@ msgstr ""
 "\n"
 "���ڿ���:\n"
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -162,13 +172,13 @@ msgstr ""
 "\n"
 "���ڿ���:"
 
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "��: "
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "������ ��ġ: "
 
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "���� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -208,31 +218,31 @@ msgstr ""
 "\n"
 "  �̸�:  "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -258,13 +268,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -272,23 +282,24 @@ msgstr ""
 "\n"
 "���� Ű: "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
+msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:39
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 
@@ -300,726 +311,861 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat ������ ������ ���� �����ϴ�"
 
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "wombat�� �����Ҽ� �����ϴ�"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution �ּҷ� minicard ����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "����ó�� ó���ϴ� Evolution ������Ʈ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "�ּҷ�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "�ּҷ�"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP ����"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "����"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "�˼����� �ּҷ� ����"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "��й�ȣ"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "�� ��й�ȣ ���"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "ȣ��Ʈ:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "��Ʈ DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "��Ʈ:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "�˻� ����:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "���:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "��ΰ� �������� ������ ����ϴ�."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "�ּҷ� ����"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "�ּҷ� �߰�"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "�̸�:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "�߰�"
+msgid "Addressbook Sources"
+msgstr "�ּҷ� �ҽ�"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "����"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "�̸�"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "�߰�(_A)"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "����(_E)"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "�ٸ� ����ó"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "�ּҷ��� ������ �����ϴ�"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "���"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "���� Ž���Ⱑ ǥ���� URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "�̸���"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "�̸��� 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "�̸��� 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "������ ��������"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "���ο� ����ó�� �����"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "�ּҷ� ����"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "����ó ���� ����"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "����ó�� �߰�"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "���ڿ��� �ּ�:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution �ּҷ� �̸� ���� �������̽�"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "����"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "���� ����"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "�̸��� ������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "�ٸ� ����ó"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "�޴»�� ���"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "������ �̸�"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "�̸��� ������ ��:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "���:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "�˻�(_S)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "�����(_v):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "����(_u)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "���� �ѽ�(_F)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "����ó(_C)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "���(_t)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "����ó ������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "�ڼ���"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "���Ϸ� ����:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "�Ϲ� ����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "�� ��ȭ ����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "��Ʈ(_t):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "����:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "��ȭ ����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Primary Email"
-msgstr "�̸���"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "HTML���� ���� ���(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Ȩ������ �ּ�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:82
-msgid "_Add"
-msgstr "�߰�(_A)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "�ּ�(_A)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "���� �̸�(_A):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "����(_B):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "����(_B)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "ȸ��(_C):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "����ó(_C)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:83 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "����(_D)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "�μ�(_D):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "��ü �̸�(_F)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "��(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "�Ŵ��� �̸�(_M):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "�޴���ȭ(_M)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "����(_N):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "�繫��(_O):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "����(_P):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "�����(_S):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "����ó�� �����ұ��?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "���� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "���� �ѽ�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "�ڵ���"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "ȸ��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "��"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "�� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "�� �ѽ�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "�޴���ȭ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "��Ÿ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "��Ÿ �ѽ�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "�߻�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
-msgid "Email 2"
-msgstr "�̸��� 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
-msgid "Email 3"
-msgstr "�̸��� 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:215
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "����ó Quick �߰�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:217
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "���� �̸� ����"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:254
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "���� �̸�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "�̸���"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "�ּ� _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "ij����"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "�ּ� Ȯ��"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "����(_y):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "�ɶ���"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "�̱�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "�ּ�(_A):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "��(_C):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "��ü �̸� Ȯ��"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "��(_F):"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "�̸�(_L):"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "����(_T):"
 
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Minicards"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "ȣ��Ʈ:"
 
-#: addressbook/gui/component/addressbook.c:243
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "����"
 
-#: addressbook/gui/component/addressbook.c:413
-#, c-format
-msgid "Enter password for %s"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook.c:441
-msgid "Unable to open addressbook"
-msgstr "�ּҷ��� ������ �����ϴ�"
-
-#: addressbook/gui/component/addressbook.c:446
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:569
-msgid "Show All"
-msgstr "��� ����"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "����"
 
-#: addressbook/gui/component/addressbook.c:571
-msgid "Advanced..."
-msgstr "����..."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "����ó ������"
 
-#: addressbook/gui/component/addressbook.c:601
-msgid "Any field contains"
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "����ó ������"
 
-#: addressbook/gui/component/addressbook.c:602
-msgid "Name contains"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:603
-msgid "Email contains"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:746
-msgid "The URI that the Folder Browser will display"
-msgstr "���� Ž���Ⱑ ǥ���� URI"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP ����"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "�˼����� �ּҷ� ����"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-provider.c:75
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:69
-msgid "Password"
-msgstr "��й�ȣ"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "�� ��й�ȣ ���"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:30
-msgid "Host:"
-msgstr "ȣ��Ʈ:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "��Ʈ:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "��Ʈ DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "�˻� ����:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
-msgid "Path:"
-msgstr "���:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "��ΰ� �������� ������ ����ϴ�."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "�ּҷ� ����"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "�ּҷ� �߰�"
-
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "�̸�:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "�ּҷ� �ҽ�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:574
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
-msgid "Name"
-msgstr "�̸�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:366
-msgid "Disable Queries"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:366
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:389
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr "����ó ���� ����"
-
-#: addressbook/gui/component/e-address-widget.c:425
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
-msgid "Add to Contacts"
-msgstr "����ó�� �߰�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution �ּҷ� minicard ����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution component for handling contacts."
-msgstr "����ó�� ó���ϴ� Evolution ������Ʈ"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Evolution addressbook component."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the sample Addressbook control"
-msgstr "�ּҷ�"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution �ּҷ� �̸� ���� �������̽�"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "����"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
-msgid "Remove All"
-msgstr "���� ����"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "�..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "�޴»�� ���"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "������ �̸�"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "�̸��� ������ ��:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "�˻�"
 
@@ -1131,72 +1277,268 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard�� ����"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+#, fuzzy
+msgid "Send message to contact"
+msgstr "���߿� �޼����� �����ϴ�"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "�μ�"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+#, fuzzy
+msgid "Print Envelope"
+msgstr "���� �μ�(_v)..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "�� ������ ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "�������ο��� �۾�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "�㰡�� �ź�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "�۵��� �������� ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "��ҵ�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "����� ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"�ڷ��� �д��� ���� �߻�:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* ����ó�� �߰��ϱ� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+#, fuzzy
+msgid "File As"
+msgstr "���Ϸ� ����:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "�̸���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+#, fuzzy
+msgid "Primary Phone"
+msgstr "�̸���"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+#, fuzzy
+msgid "Business Phone"
+msgstr "���� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+#, fuzzy
+msgid "Company Phone"
+msgstr "ȸ��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+#, fuzzy
+msgid "Home Phone"
+msgstr "�� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "���� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+#, fuzzy
+msgid "Home Address"
+msgstr "�ּ� Ȯ��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "�޴���ȭ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "���� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "�� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+#, fuzzy
+msgid "Other Phone"
+msgstr "�ٸ� ����ó"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+#, fuzzy
+msgid "Other Address"
+msgstr "�ּ� Ȯ��"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "�� ����Ʈ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "�μ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "�繫��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "��Ʈ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
-msgid "Click here to add a contact"
-msgstr "����ó�� �߰��ϱ�"
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "�Ϸ�"
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "�޷� �ҷ�����..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "�ּҷϿ� ����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1205,7 +1547,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "ī��: "
 
@@ -1234,7 +1576,8 @@ msgid "Dimensions:"
 msgstr "ũ��:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "�۲�..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1294,7 +1637,6 @@ msgid "Margins"
 msgstr "����"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "�� ��:"
 
@@ -1375,142 +1717,313 @@ msgid "Width:"
 msgstr "��:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr ""
+#, fuzzy
+msgid "_Font..."
+msgstr "�۲�..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:258
-msgid "File not found"
-msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "�˶� ���"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "�˶� ����� ���� ���丮"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Evolution�� ���� ����"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%A %b %d %Y %H:%M�� �˶�"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "�ݱ�"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "����� �����ϱ�"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "����� �˷��� �ð�"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ȯ��"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "�׳��� �ʱ�ȭ �Ҽ� �����ϴ�"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/calendar-commands.c:282
-msgid "Open calendar"
-msgstr "�޷� ����"
+#: calendar/gui/calendar-commands.c:402
+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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:324
-msgid "Save calendar"
-msgstr "�޷� ����"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351 mail/message-list.c:626
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:625
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:624
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "���� ����"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "�Ϸ��"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "��ҵ�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:800 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1518,161 +2031,317 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:770
-#: mail/mail-account-editor.c:772 mail/mail-account-editor.c:863
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:45 shell/e-shell-view.c:1120
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "���Ǿȵ�"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "�ݺ���"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "�ƴϿ�"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "ī��: "
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "��"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "��"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "�޷��� ǥ���� URI"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>�޷¸� �д��� ����</b>"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "�޴»�� ���"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>�޷¸� �д� �� ����:<br>���������ʴ� ���"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "���� �ɼ�"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "ǥ��"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "��� ����"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "����"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "�޷� �ҷ����̱�"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "�޷��� ǥ���� URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "�޽������� %s�� �̵�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "����� �˷��� �ð�"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "�Ҹ� ����"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ȯ��"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "���α׷��� �����մϴ�"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "�˶� ���"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "�˶� ����� ���� ���丮"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "��"
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "�׳��� �ʱ�ȭ �Ҽ� �����ϴ�"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "���� �ֱ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
-msgid "Could not create the alarm notify service factory"
-msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "��"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M�� �˶�"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "��"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d ����"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "�Ϸ羿"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d �־�"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " ���־�"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d ��"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " �ѽð���"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d ���"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "�Ϻи���"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d �ʸ���"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 �ʸ���"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "�Ҹ� ����"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "��� �޽��� ��� ���̱�"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "�̸��� ������"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "���α׷��� �����մϴ�"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "��ӽ�����"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "��� ������"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "��� ��������"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "��� ���� ��"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "�ݱ�"
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "��¥:"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "����� �����ϱ�"
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "���"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "����(_O)"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "��� ��"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "��"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "����� ����"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr ""
@@ -1702,36 +2371,36 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "�޷�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "�޷� ����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "�޷�"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "�޷� ����"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "����"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1739,1015 +2408,1153 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "���� �ɼ�"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "ǥ��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "�Ϸ��� ��:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "�������� ù°��:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "�ݿ���"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+msgid "Mon"
+msgstr "��"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "����"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
+msgid "Remind me of all appointments"
+msgstr "��� ����� ������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "��"
+msgid "Sat"
+msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
-msgid "Monday"
-msgstr "������"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "�����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr ""
+#, fuzzy
+msgid "Show appointment end times in week and month views"
+msgstr "��� ���ð� ����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:52
-msgid "Pick a color"
+msgid "Start of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
-msgid "Priority"
-msgstr "�켱����"
+msgid "Sun"
+msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "��� ����� ������"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "�Ͽ���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr ""
+#, fuzzy
+msgid "Task List"
+msgstr "�۾�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "��"
+msgid "Tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
-msgid "Saturday"
-msgstr "�����"
+msgid "Thu"
+msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "����"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "�����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "��� ���ð� ����"
+#, fuzzy
+msgid "Time"
+msgstr "����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "��"
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"��: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
-msgid "Sunday"
-msgstr "�Ͽ���"
+msgid "Tue"
+msgstr "ȭ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "�۾��е�"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "ȭ����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "��"
+msgid "Wed"
+msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
-msgid "Thursday"
-msgstr "�����"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#, fuzzy
+msgid "Work Week"
+msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "ȭ"
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
-msgid "Tuesday"
-msgstr "ȭ����"
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "��"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
-msgid "Wednesday"
-msgstr "������"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:86
-msgid "seconds."
-msgstr "��."
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "�Ϸ��"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "�Ϸ��"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "����� �����Ѵ�"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "��� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "���� ���� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "�ٸ� �̸����� ����..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "������ ��� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "������ �� ������� ����� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "������ �� ������� �۾��� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "������ �� ������� ���������� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "������ ��� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% �Ϸ�(_p):"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "�з�"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date &amp; Time"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "������ ��������"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "�Ϸ�� ��¥:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "����:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
 msgstr ""
+"\n"
+"��: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "���� Ű(_b)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "���� ��¥(_r):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "���(_u):"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "�۾�"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "���"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "����ó(_C)..."
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "���� ���"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "�켱����(_P):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "����(_S):"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "�з�"
 
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "�۾� ����"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "���� ��¥"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
-msgid "No summary"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
-#, c-format
-msgid "Appointment - %s"
-msgstr "��� - %s"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
+msgstr "���� Ű(_b)"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
-#, c-format
-msgid "Task - %s"
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
+msgstr "���(_u):"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
-#, c-format
-msgid "Journal entry - %s"
-msgstr "���� ���� - %s"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
-msgid "Categories"
-msgstr "���"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "����ġ�� �ð�(_E):"
 
-#: calendar/gui/e-calendar-table.c:158
-msgid "Completion Date"
-msgstr "�Ϸ� ��¥"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "���� �ð�(_S):"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "End Date"
-msgstr "������ ��"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "Start Date"
-msgstr "������ ��"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "�׷� �̸�:"
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Geographical Position"
-msgstr "�������� ��ġ"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "�������:"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Percent complete"
-msgstr "�ۼ�Ʈ �Ϸ�"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
-msgid "Summary"
-msgstr "���"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Transparency"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "�� ������"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "Alarms"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Click here to add a task"
-msgstr "�۾���Ͽ� �߰��ϱ�"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "���� ����"
 
-#: calendar/gui/e-calendar-table.c:373
-#, c-format
-msgid "0%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "10%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "�ݴ�"
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "20%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "30%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "40%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "70%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "�� ������"
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "80%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "�� ������"
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "90%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "�� ������"
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
-msgid "Mark Complete"
-msgstr "�Ϸ� ǥ��"
-
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark the task complete"
-msgstr "�۾��� �Ϸ�Ǿ����� ǥ��"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "����..."
 
-#: calendar/gui/e-calendar-table.c:556
-msgid "Edit this task..."
-msgstr "�� ������ ����..."
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit the task"
-msgstr "���� ����"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "�Ϸ� ��¥"
 
-#: calendar/gui/e-calendar-table.c:559
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "�� ������ �����մϴ�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:560
-msgid "Delete the task"
-msgstr "�� ������ �����մϴ�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "������"
 
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 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:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "����"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 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:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
-#: calendar/gui/print.c:613
-msgid "am"
-msgstr "����"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:612
-msgid "pm"
-msgstr "����"
-
-#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
-msgstr "�� ���"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "����"
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
-msgid "Go to Today"
-msgstr "���÷� �̵�"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "����:"
 
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
-msgid "Go to Date..."
-msgstr "��¥�� �̵�..."
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "����:"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "����"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
-msgid "Delete this Appointment"
-msgstr "�� ����� �����մϴ�"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "����:"
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3060
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "����"
 
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "�̸�����"
 
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "����"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "�޷¿� �߰�"
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "����"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "����"
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "�ݴ�"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "������"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "��"
 
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "�޷� ����"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "��"
 
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "���� ���"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
-msgid "Date:"
-msgstr "��¥:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "�޷� �ҷ�����..."
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "����:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "������"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
-msgid "Sender"
-msgstr "������"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "������"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "���"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "(�̸� ����)"
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "�۾�"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "������"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "������ �ּ�"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "������"
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "������:"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "���� ��¥(_r):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "����"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "ȸ�� ����:"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "�켱����(_P):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "����(_S):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "��ȹ��:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "�� ������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1014
-msgid "Status"
-msgstr "����"
-
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
-msgid "All"
-msgstr "���"
-
-#: calendar/gui/e-tasks.c:154
-msgid "Category:"
-msgstr "���:"
-
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "70%"
 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/e-week-view-main-item.c:338
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
-msgid "New Appointment..."
-msgstr "�� ���..."
-
-#: calendar/gui/e-week-view.c:3271
-msgid "Delete All Occurrences"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "���"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "��� �⺻"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "����"
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "����(_C)"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "����"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "���̱�(_P)"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "����"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
-msgid "Play a sound"
-msgstr "�Ҹ� ����"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "�̸�����"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "�۾���Ͽ� �߰��ϱ�"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
-msgid "Run a program"
-msgstr "���α׷��� �����մϴ�"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
-msgid "Send an email"
-msgstr "�̸��� ������"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "���"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "����..."
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "�Ϸ��"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
-msgid "Show a dialog"
-msgstr "���̾�α� ����"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "�Ϸ� ��¥"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "����ġ�� �ð�(_E):"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "���� �ð�(_S):"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "������ ��"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "���� ��¥(_S):"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "�������� ��ġ"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "�켱����"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "������ ��"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "���"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "��� ��"
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "�۾�"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
+#. 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:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
+#. 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:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "��"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "����"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "����"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "����"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "����� ����"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
+msgstr "�� ���"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "��"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "���÷� �̵�(_T)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "��"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "��¥�� �̵�..."
 
-#: calendar/gui/event-editor.c:371
-msgid "Edit Appointment"
-msgstr "����� �����Ѵ�"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "�� ����� �����մϴ�"
 
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr ""
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "���� ������ ����"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "�� �޼����� �����մϴ�"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:601
-msgid "on the"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:608
-msgid "th"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
-#, c-format
-msgid " %d days"
-msgstr " %d ����"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-msgid " 1 day"
-msgstr "�Ϸ羿"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#: calendar/gui/event-editor.c:1537
-#, c-format
-msgid " %d weeks"
-msgstr " %d �־�"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-msgid " 1 week"
-msgstr " ���־�"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1542
-#, c-format
-msgid " %d hours"
-msgstr " %d ��"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-msgid " 1 hour"
-msgstr " �ѽð���"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1547
-#, c-format
-msgid " %d minutes"
-msgstr " %d ���"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-msgid " 1 minute"
-msgstr "�Ϻи���"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1552
-#, c-format
-msgid " %d seconds"
-msgstr " %d �ʸ���"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-msgid " 1 second"
-msgstr " 1 �ʸ���"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1601
-msgid " before start of appointment"
-msgstr "��ӽ�����"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-msgid " after start of appointment"
-msgstr "��� ������"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1611
-msgid " before end of appointment"
-msgstr "��� ��������"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1613
-msgid " after end of appointment"
-msgstr "��� ���� ��"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "��¥:"
+
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "�޷� �ҷ����̱�"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "�޷� �ҷ�����..."
+
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "�ٸ��̸����� �޼��� ����..."
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr "���"
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr "���:"
+
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "�� ���..."
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2773,236 +3580,253 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "���÷� �̵�"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "�Ͽ�"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "���"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "����"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "�ÿ�"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "����"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "���÷� �̵�"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�۾�"
 
 #. Day
-#: calendar/gui/print.c:1074
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1108
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1115
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1334
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "�μ� �̸�����"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "�� �׸��� �μ�"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "�μ� ����"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "ǥ���� �۾� ������ URI URI"
 
@@ -3034,33 +3858,129 @@ msgid ""
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-filter-driver.c:848
+#: camel/camel-cipher-context.c:171
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
+
+#: camel/camel-cipher-context.c:211
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
+
+#: camel/camel-cipher-context.c:251
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
+
+#: camel/camel-cipher-context.c:294
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
+
+#: camel/camel-cipher-context.c:336
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#, fuzzy
+msgid "Syncing folders"
+msgstr "���� ����ȭ"
+
+#: camel/camel-filter-driver.c:644
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "�ּҷ��� ������ �����ϴ�"
+
+#: camel/camel-filter-driver.c:653
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "�ּҷ��� ������ �����ϴ�"
+
+#: camel/camel-filter-driver.c:667
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "�޼��� %s�� ��������"
+
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "���޵� �޽��� - %s"
+
+#: camel/camel-filter-driver.c:672
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"�޼����� ������ ����: %s\n"
+"  %s"
+
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#, fuzzy
+msgid "Syncing folder"
+msgstr "���� ����ȭ"
+
+#: camel/camel-filter-driver.c:766
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
+
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
+
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���� ��� ����: %s: %s"
 
-#: camel/camel-filter-driver.c:853
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���� ������ ����: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "���� � ������ ����: %s: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3069,282 +3989,378 @@ msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "`%s'�� ��������� ������ �� �����ϴ�: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "`%s'�� ��������� ������ �� �����ϴ�: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:189
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:201
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:239
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
+msgstr "(�˼����� ����)"
+
+#: camel/camel-movemail.c:263
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "���������� �д��� ���� �߻�: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "���� �ӽ������� ������ �����߻�: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "���� �ӽ������� ������ �����߻�: %s"
+
+#: camel/camel-pgp-context.c:193
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-pgp-context.c:196
 #, c-format
-msgid "Could not create pipe: %s"
+msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr "��ȣ�� ���������ʾҽ��ϴ�."
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
-msgid "Could not fork: %s"
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
 #, c-format
-msgid "Movemail program failed: %s"
+msgid "Couldn't create temp file: %s"
+msgstr "�ӽ� ������ ����� ����: %s"
+
+#: camel/camel-pgp-context.c:1063
+msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(�˼����� ����)"
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
+msgstr "�����ڰ� ������������"
 
-#: camel/camel-provider.c:137
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:170
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s ���� ���� %s"
 
-#: camel/camel-remote-store.c:174
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:221
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "������ ��ҵ�"
 
-#: camel/camel-remote-store.c:224
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:225
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(�𸣴� ȣ��Ʈ)"
 
-#: camel/camel-remote-store.c:306 camel/camel-remote-store.c:368
-#: camel/camel-remote-store.c:439
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "�۾� ���"
 
-#: camel/camel-remote-store.c:445
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "���� ����."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:39
+#: 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."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
 msgstr ""
 
-#: camel/camel-sasl-plain.c:31
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+#: 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 ""
 
-#: camel/camel-search-private.c:105
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "���� ����."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:139
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:478
+#: camel/camel-service.c:548
+#, c-format
+msgid "Resolving: %s"
+msgstr ""
+
+#: camel/camel-service.c:575
 #, c-format
-msgid "No such host %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:481
+#: camel/camel-service.c:600
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:320
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:415
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3353,121 +4369,231 @@ msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:941 mail/mail-ops.c:948
-#: mail/mail-ops.c:966 mail/mail-ops.c:967
-msgid "Trash"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-url.c:77
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "�� ������ ���������ʽ��ϴ�"
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "�� ������ ���������ʽ��ϴ�"
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
-msgid "URL string `%s' contains no protocol"
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
-#: camel/camel-url.c:92
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL `%s'�� ����ε� ���������� ������ �����ʽ��ϴ�"
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
 
-#: camel/camel-url.c:152
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "URL `%s'���ִ� ��Ʈ ��ȣ�� ���ڰ� �ƴմϴ�"
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
-#: camel/camel-vee-folder.c:962
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
+
+#: camel/camel-vee-folder.c:452
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "�׷� �޼��� ����: %s"
+
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"�޼����� ������ ����: %2$s �������� %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ������ ����: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
-msgid "Unknown error"
-msgstr "�� ������ ����"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "������ �亯�� �ʹ� ���� �������ϴ�."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����κ��� ����ġ���� OK�亯�� ��: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:176
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:345
-msgid "Scanning IMAP folder"
-msgstr "IMAP ������ ���캾�ϴ�"
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:946
-#: camel/providers/imap/camel-imap-folder.c:1143
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#: camel/providers/imap/camel-imap-folder.c:976
-#: camel/providers/imap/camel-imap-folder.c:1177
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "�޽������� ����"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:40
-msgid "IMAPv4"
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
 msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:42
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "�� ������ �ۼ��մϴ�"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "�޼����� �� ������ �����մϴ�"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+msgid "Folders"
+msgstr "����"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:58
-msgid "Secure IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:60
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#: camel/providers/imap/camel-imap-provider.c:54
+#, fuzzy
+msgid "Namespace"
+msgstr "�ٲٱ�"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:77
+#: camel/providers/imap/camel-imap-provider.c:63
+msgid "IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:65
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:441
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:451
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/imap/camel-imap-store.c:476
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:491
-#: camel/providers/smtp/camel-smtp-transport.c:374
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3475,93 +4601,106 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:871
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
+msgid "No such folder %s"
+msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1328
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:46
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:56
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3570,34 +4709,35 @@ msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "�׷� �޼��� ����"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3606,35 +4746,58 @@ msgstr ""
 "���� `%s'�� ����� ����:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"���� `%s'�� ����� ����:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+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:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3643,196 +4806,275 @@ msgstr ""
 "�޼����� ������ ����: %2$s �������� %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, 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:240
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "������ ���"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "���� ����ȭ"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+"%s ���丮��\n"
+"������ ���� �����ϴٿ���: %s"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "���� `%s'�� �������� �ʽ��ϴ�."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "���� ���� ���� %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "�ӽ� ������ ������ ����: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "�ӽ� ������ ������ ����: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "�޼��� %s�� ã���� ����."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "�������� �׷����� ������ ����."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3841,542 +5083,638 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr "POP ����� ������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "�޼����� ������ ����: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP �޼��� %d�� ������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "�޼����� ������ ����: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "�޼��� �Ӹ���"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "������ ���� �����"
+
+#: 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:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:71
+#: 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:81
+#: 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:93
+#: 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:181
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:298
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:356
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:359
-#: camel/providers/pop3/camel-pop3-store.c:396
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:386
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "�޼������� ���� ����� �˾Ƴ����� ����"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail�� ���� ���� ����"
 
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:52
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:54
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:146
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:148
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:150
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:152
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:154
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:156
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:158
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:164
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:166
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "������ �ʿ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "%s Ÿ�� ������ ���� ����"
+
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:494
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:521
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:542
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "�޼����� ����"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:655
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "����:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:785
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:804
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:913
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:993
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 ����Ʈ"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����Ʈ"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "÷��"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "������ ÷���մϴ�"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "÷������ ��Ͽ��� ������ �׸��� �����մϴ�"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "÷������ �߰�..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
-msgid "Attachment"
-msgstr "÷��"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "÷�� �Ӽ�"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "���� �̸�:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "÷��"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME ����:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "�ּҷ�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:696
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "���� ���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:698
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "ȸ�� �ּ�:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:700
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "�޴� ���:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "�޼����� ���� ����� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:702
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�޼����� �纻�� ���� ����� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "���� ����:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer.c:518
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "������ ÷���մϴ�"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "������ �д��� ���� �߻�: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "���"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:818 shell/e-shell-view-menu.c:193
-msgid "Evolution"
+#: composer/e-msg-composer.c:997
+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:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "���� ������ ���� �߻�: %s"
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"��������� ������ ���� �����ϴ�: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
+"��������� ������ ���� �����ϴ�: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"%s�� �޽��� ������ ���� �߻�:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4386,47 +5724,29 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr ""
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "���� ����"
 
-#: composer/e-msg-composer.c:975
-msgid "That file does not exist."
-msgstr "�� ������ ���������ʽ��ϴ�"
-
-#: composer/e-msg-composer.c:985
-msgid "That is not a regular file."
-msgstr "����� ���� ������ �ƴϳ׿�."
-
-#: composer/e-msg-composer.c:995
-msgid "That file exists but is not readable."
-msgstr "������ �ֱ���ѵ� ���� ���� ���׿�."
-
-#: composer/e-msg-composer.c:1005
-msgid "That file appeared accesible but open(2) failed."
-msgstr "������ ������ �ִ� �Ű�����ѵ� �� ���� �����ϴ�."
-
-#: composer/e-msg-composer.c:1027
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"������ ���� ũ�׿�(100k�� ����).\n"
-"�����ϰ� �����Ű� �³���?"
-
-#: composer/e-msg-composer.c:1048
-msgid "An error occurred while reading the file."
-msgstr "������ �д� ���� ���� �߻�"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "�ؽ�Ʈ ���� ����"
 
-#: composer/e-msg-composer.c:1354 composer/e-msg-composer.c:1686
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: composer/e-msg-composer.c:1770
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4434,314 +5754,155 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Evolution ��."
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "�ּ� _2:"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "����� ����"
+
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y/%m/%d %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:282
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y/%m/%d %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:314
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:322
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "�⺻ �׳� ���α׷����� %s�� ����"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "�⺻ �׳� �������� %s�� ����"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s�� �̸��� ������"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "�並 %s�� ����"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s ����"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s �ݱ�"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s��(��) �������� �̵�"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s��(��) ���� �ٷ� �̵�"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s��(��) ���� �ٷ� �̵�"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s ����"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML ������ �� ���� �����ϴ�:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"�ڷ��� �д��� ���� �߻�:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF ���"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "����"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "�ڵ����� ����"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "���� ����"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "���� �ֱ�"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "��"
-
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "����"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "����"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "��"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "��"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "��"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "��"
 
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "��"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "��"
 
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "��"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "��"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "��"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "��"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "��. ��¥ �����ؾ� �ϴ°� ��������:-)"
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "��. ���� ��¥�� ���������ʳ׿�."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:322
+#: 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"
@@ -4749,49 +5910,53 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "���� �ð�"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "����"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<��¥�� �����ҷ��� ���� ��������>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "�Ÿ��� ��Ģ"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "���� ����"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "���� �߰�"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "���� ����"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4799,19 +5964,20 @@ msgstr ""
 "��, ���� ������ ���� �����̳׿�.\n"
 "�ڷ� ���ư� ������ ����� ������ �����ϼ���."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "���� ����"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "���� URI�� �����ϼ���"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<������ �������� ���� ��������>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4820,41 +5986,58 @@ msgstr ""
 "���Խ� '%s'���� ����:\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "�׽�Ʈ"
 
-#: filter/filter-rule.c:598
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "��Ģ �̸�: "
 
-#: filter/filter-rule.c:602
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "�������"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:639
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "��� ������ �� ������ ��"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "� �����̶� ������ ��"
 
-#: filter/filter-rule.c:655
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "���� �߰�"
 
-#: filter/filter-rule.c:661
-msgid "Remove criterion"
-msgstr "���� ����"
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "incoming"
+msgstr "�����°�"
+
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "outgoing"
+msgstr "�����°�"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "�߰�"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "����"
 
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
@@ -4872,7 +6055,7 @@ msgstr "�����°�"
 msgid "Outgoing"
 msgstr "�����°�"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "���� ����"
 
@@ -4897,8 +6080,9 @@ msgid "with all local folders"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "�����"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -4973,275 +6157,427 @@ msgid "Expression"
 msgstr "ǥ��"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "������ �ּ�"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "�߿�"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "�޼��� �Ӹ���"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "�޼����� ���½��ϴ�"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "������ �̵�"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "�޴� ���"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "ȸ��"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1014
+#: 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:44
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
+msgstr "������"
+
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "���� ����"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "ũ��"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "����"
+
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:126
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr ""
+
+#: filter/rule-editor.c:240
+#, fuzzy
+msgid "Add Rule"
+msgstr "�Ÿ��� ��Ģ�� �߰�"
+
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "���� �̸� ����"
+
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:319
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "��������"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "����"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "�̸���"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "�ּҷ� �߰�"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "����..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: 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:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "�̸���"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution ���� �ۼ���."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "���� ����"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "����(_P)..."
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:392
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:244
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"������ ����"
 
-#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "����"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "�ӽ� ���丮�� ���� ���� �����ϴ�: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "���� ������ ã�⸦ ����"
 
-#: mail/folder-browser.c:510
-msgid "VFolder on Subject"
-msgstr ""
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
+msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:513
-msgid "VFolder on Sender"
-msgstr ""
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "�߼��ڿ����� ��������(_n)"
 
-#: mail/folder-browser.c:516
-msgid "VFolder on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "�����ڿ����� ��������(_R)"
 
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
-msgid "VFolder on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
+msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:525
-msgid "Filter on Subject"
-msgstr ""
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
+msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: mail/folder-browser.c:528
-msgid "Filter on Sender"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: mail/folder-browser.c:531
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "�����ο����� �Ÿ���(_R)"
 
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "�ٽ� ����"
 
-#: mail/folder-browser.c:547
-msgid "Save As..."
-msgstr "�ٸ� �̸����� ����..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "�ٸ��̸����� ����(_S)..."
 
-#: mail/folder-browser.c:549 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "�μ�"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:554
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "���� ������� ȸ��"
 
-#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to All"
-msgstr "��ü ȸ��"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward"
-msgstr "����"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:560
-msgid "Forward inline"
-msgstr ""
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "����(_F)"
+
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr "���� ������ ǥ��(_k)"
 
-#: mail/folder-browser.c:563
-msgid "Mark as Read"
-msgstr "���� ������ ǥ��"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr "���� ���� ������ ǥ��(_n)"
+
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "�߿�"
 
-#: mail/folder-browser.c:565
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
 msgstr "���� ���� ������ ǥ��"
 
-#: mail/folder-browser.c:570
-msgid "Move to Folder..."
-msgstr "������ �̵�..."
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "������ �̵�(_M)..."
 
-#: mail/folder-browser.c:572
-msgid "Copy to Folder..."
-msgstr "������ ����..."
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:576
-msgid "Undelete"
-msgstr "�ǻ츲"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "�ǻ츲(_U)"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "�ּҷ� �߰�"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "�Ÿ��� ����"
 
-#: mail/folder-browser.c:590
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
+msgstr "�޽����κ��� �Ÿ��� ����(_C)"
+
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "���ϸ� ����Ʈ������ ����"
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution ���� �ۼ���."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import mbox into Evolution"
+msgstr "Evolution���� ������ �������Ƿ��� \"��������\"�� ��������."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports mbox files into Evolution"
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5274,63 +6610,97 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:116
-msgid " (default)"
+#: 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 ""
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
-msgid "Are you sure you want to delete this account?"
-msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
-
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
-msgid "Are you sure you want to delete this news account?"
-msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution ��ġ"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:452
-msgid "Evolution Account Manager"
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-editor.c:301
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "����:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
 msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"�� �޽����� ���������ʾҽ��ϴ�.\n"
+"\n"
+"����� ������ �����Ͻðڽ��ϱ�?"
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:720
-msgid "Evolution Account Editor"
+#: mail/mail-accounts.c:135
+msgid " (default)"
+msgstr ""
+
+#: mail/mail-accounts.c:174
+msgid "Disable"
 msgstr ""
 
-#: mail/mail-account-editor.c:741
-msgid "Unspecified"
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+msgid "Enable"
 msgstr ""
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-accounts.c:264
+msgid "Are you sure you want to delete this account?"
+msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "�ǻ츲"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "�⺻ �������� �ϱ�"
+
+#: 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:742
+msgid "Evolution Account Manager"
+msgstr ""
+
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5338,135 +6708,228 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:296
-msgid "You must configure an account before you can send this email."
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:318
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:583
+#: mail/mail-callbacks.c:410
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:765
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "���޵� �޽���:\n"
 
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1081 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr ""
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1085 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/mail-callbacks.c:1129
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1245
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "���� �Ÿ���(_F)..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:1341
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Evolution ���� ������"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr ""
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "����"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "����"
-
 #: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Accounts"
+msgstr "����"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "÷��"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Authentication Type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:15
+msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "���� �ۼ�"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5476,390 +6939,554 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "�Ϸ�"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Drafts"
+msgstr "�ʰ�"
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "�� ������ ����"
+
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "����"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-config.glade.h:25
-msgid "Email address:"
-msgstr "���ڿ��� �ּ�:"
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "���� ����"
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "��ü�̸�:"
 
-#: mail/mail-config.glade.h:29
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-msgid "Hostname:"
-msgstr "ȣ��Ʈ:"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "����:"
 
-#: mail/mail-config.glade.h:32
-msgid "IMAP"
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:45
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Include this account when receiving mail"
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "Keep mail on server"
-msgstr "������ ���� �����"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "�ݴ�"
 
-#: mail/mail-config.glade.h:36
-msgid "Kerberos"
+#: mail/mail-config.glade.h:49
+msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Mail"
-msgstr "����"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Account"
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:40
-msgid "Mail Configuration Druid"
-msgstr "���� ���� Druid"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "���Ϲڽ� ����"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-config.glade.h:42
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "�޼��� �Ӹ���"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP ����"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "����"
 
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr ""
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Optional Information"
+msgstr "���� ����"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP ���"
 
-#: mail/mail-config.glade.h:50
-msgid "Password:"
-msgstr "��й�ȣ:"
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "�ο�(_Q)"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "�� ��й�ȣ ���"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "������ ����"
 
-#: mail/mail-config.glade.h:56
-msgid "Reply address:"
-msgstr "ȸ�� �ּ�:"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Receiving Options"
+msgstr "�޾���"
 
-#: mail/mail-config.glade.h:57
-msgid "Required"
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "��ȣ ����"
+#: mail/mail-config.glade.h:81
+#, fuzzy
+msgid "Required Information"
+msgstr "����� ����"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "����(_S)"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP ���α׷� ������ ����"
 
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "���� ������ ��������"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "�⺻���� ������ HTML�������� ����"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Sending Mail"
+msgstr "������ ����"
+
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#, fuzzy
+msgid "Sent"
+msgstr "����"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "�޼������� �ٽ� ������(_R)"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "�޼����� ������ ����"
+
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "���� ����: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "������ ������ �䱸�մϴ�"
 
-#: mail/mail-config.glade.h:68
-msgid "Server type:"
-msgstr "���� ����::"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "����:"
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "���� ����"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
-msgid "Transport"
-msgstr ""
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Special Folders"
+msgstr "���� ����"
 
-#: mail/mail-config.glade.h:74
-msgid "Transport Authentication"
+#: mail/mail-config.glade.h:101
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "Type"
+#: mail/mail-config.glade.h:103
+msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr "�� ������ ����ų �̸��� �����ϼ���.���� \"����\"�̳� �Ǵ� \"��\"."
-
-#: mail/mail-config.glade.h:77
-msgid "User Information"
-msgstr "����� ����"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "������̸�:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "����(_E)"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "minutes."
-msgstr "��"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
 
-#: mail/mail-config-druid.c:421
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "��."
+
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:708
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
 msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
 
-#. set window title
-#: mail/mail-config-druid.c:1215
-msgid "Evolution Account Wizard"
-msgstr "Evolution ���� ������"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "÷������ ����"
 
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "�ӽ� ���丮�� ���� ���� �����ϴ�: %s"
-
-#: mail/mail-display.c:290
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "��ũ�� ����..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "%s���� ����..."
 
-#: mail/mail-display.c:294
-msgid "View Inline"
+#: mail/mail-display.c:399
+#, c-format
+msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:403
+msgid "Hide"
+msgstr "����"
+
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "�޽��� ������ �о�帲"
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "�����Ѱ� ����"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "������ ����(_f)... (��ĥ����)"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "�ٸ� �̸����� ����..."
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "View Inline (via %s)"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "����"
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d �ʸ���"
 
-#: mail/mail-format.c:506
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷��"
 
-#: mail/mail-format.c:723
-msgid "Loading message content"
-msgstr "�޽��� ������ �о�帲"
+#: mail/mail-format.c:662
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "��¥"
 
-#: mail/mail-format.c:1012
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "���ڿ��� �ּ�:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "������"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "ȸ�� �ּ�:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "�޴»��"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "����:"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "GPG/PGP ���α׷��� �����ϴ�."
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "��ȣȭ�� �޽����� ����������"
 
-#: mail/mail-format.c:1018
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "��ȣȭ�� �޼���"
 
-#: mail/mail-format.c:1019
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1088 mail/mail-format.c:1475
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1096 mail/mail-format.c:1483
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1696
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1708
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1712
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1746
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1751
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
-#, c-format
-msgid "No such folder %s"
-msgstr "%s���� ������ ����"
-
-#: mail/mail-local.c:508
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "`%s'��(��) ����"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 
-#: mail/mail-local.c:790
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "���� �缳��"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "���� ���� �ݴ���"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "���� ������ �ٸ� �̸����� �ٲپ ����"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "�� ������ ����"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "�޼��� ����"
-
-#: mail/mail-local.c:928
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:967
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:181
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "%s ����"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5868,96 +7495,105 @@ msgstr ""
 "�۾� ������ ������ �߻��߽��ϴ�:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:670 mail/session.c:91
-msgid "Do you accept?"
-msgstr "�޾Ƶ��̰ڽ��ϱ�?"
-
-#: mail/mail-mt.c:864
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ������ ��"
 
-#: mail/mail-ops.c:520
-msgid "Sending message"
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
 msgstr "�޼����� ����"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
+
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+msgid "Complete."
+msgstr "�Ϸ��"
+
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�޽������� %s�� �̵�"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�޽������� %s�� ����"
 
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "�̵���"
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "������"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:1016
 #, c-format
-msgid "%s message %d of %d (uid \"%s\")"
+msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:926
-#, c-format
-msgid "Scanning folders in \"%s\""
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1084
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "���޵� �޽���"
 
-#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "%s ������ ����"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "���� �缳��"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "���� ����"
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�޼��� %s�� ��������"
 
-#: mail/mail-ops.c:1495
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "�޼������� ��������"
 
-#: mail/mail-ops.c:1505
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1579
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "�޽������� ����"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5966,12 +7602,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1671
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
-
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5980,11 +7611,11 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "÷�� ����"
 
-#: mail/mail-ops.c:1774
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5993,409 +7624,1671 @@ msgstr ""
 "��� ������ ����� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1802
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "�˻�(_S)"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(�������)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "�޼��� �μ�"
 
-#: mail/mail-send-recv.c:136
-msgid "Cancelling ..."
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "�޼���"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "�޼����� ����"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "����"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "�"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "���:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "����ϴ� ��..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "���� �ְ��ޱ�"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "�޾���"
 
-#: mail/mail-send-recv.c:283
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "������ ..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "��ٸ��� �� ..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "������ ��"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "��ҵ�."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "�Ϸ��"
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "����� ����"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�ӽ� mbox `%s'�� ������� �����ϴ�: %s"
 
-#: mail/mail-tools.c:185
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (���޵� �޽���)"
-
-#: mail/mail-tools.c:195
-msgid "Fwd: (no subject)"
-msgstr "����: (���� ����)"
-
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���޵� �޽��� - %s"
 
-#: mail/mail-tools.c:214
-msgid "Forwarded message (no subject)"
-msgstr "���޵� �޽��� (���� ����)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "���޵� �޽���"
 
-#: mail/mail-tools.c:411
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----���� �޽���-----<br><b>���� ���:</b> %s<br><b>�޴� ���:</b> "
-"%s<br><b>����:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "���޵� �޽���"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "���� ����"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "�� ��������"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
-msgid "Reply"
-msgstr "ȸ��"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
-msgid "Reply to the sender of this message"
-msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
-msgid "Reply to all recipients of this message"
-msgstr "�� �޼����� ���� ��� ������� ȸ���� �մϴ�"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
-msgid "Forward this message"
-msgstr "�� �޼����� �ٸ�������� �����մϴ�"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
-msgid "Print the selected message"
-msgstr "������ �޼����� �μ��մϴ�"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "�� �޼����� �����մϴ�"
-
-#: mail/message-list.c:614
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:615
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "�������� �������� �޼���"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:623
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:628
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:878
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:885
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:916
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "�޽������� ����"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1015
-msgid "From"
-msgstr "������"
-
-#: mail/message-list.c:1015
-msgid "Date"
-msgstr "��¥"
-
-#: mail/message-list.c:1015
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "�޾���"
 
-#: mail/message-list.c:1016
-msgid "To"
-msgstr "�޴»��"
-
-#: mail/message-list.c:1016
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "ũ��"
 
-#: mail/openpgp-utils.c:89
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "����"
+
+#: mail/subscribe-dialog.c:77
+msgid "Store"
+msgstr ""
+
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:168
 #, c-format
-msgid "Please enter your %s passphrase for %s"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:92
+#: mail/subscribe-dialog.c:271
 #, c-format
-msgid "Please enter your %s passphrase"
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP ���α׷��� �����ϴ�."
+#: mail/subscribe-dialog.c:273
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr ""
 
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "��ȣ�� ���������ʾҽ��ϴ�."
+#. Construct the app
+#: mail/subscribe-dialog.c:878
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "���� ����(_S)..."
 
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "�����ڰ� ������������"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
 
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "�ӽ� ������ ����� ����: %s"
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
 
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
-msgid "Folder"
-msgstr "����"
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "���"
 
-#: mail/subscribe-dialog.c:74
-msgid "Store"
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "��� ����"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "���� %l:%M %p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "���� %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "���"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: mail/subscribe-dialog.c:156
-msgid "Display folders starting with:"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: mail/subscribe-dialog.c:186
-#, c-format
-msgid "Getting store for \"%s\""
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution ��ġ"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "���� �̸�:"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>�޷¸� �д��� ����</b>"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "���� ����:"
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "����"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "���� ���� ���� �����ϼ���:"
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "����:"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
 msgstr ""
-"%s�� �������� ��\n"
-"������ %d�� ������."
 
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution��..."
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "�޼��� �μ��� ����"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "���"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
-"������ ������ ���ִ� ������ �����ϴ�\n"
-"%s"
 
-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "��������"
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
 msgstr ""
-"%s�� ��������.\n"
-"%s�� �����մϴ�"
 
-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr "%s��(��) �д��� ���� �߻�"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
 msgstr ""
-"%s�� �������� ��\n"
-"������ 1�� ������."
 
-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "�ڵ�"
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
 
-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "���� �̸�:"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "��Ʈ"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "������ ��������"
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
 
-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "���� ����:"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "��Ʈ(_t):"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "��������"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
 
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "���̱�"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Evolution���� ������ �������Ƿ��� \"��������\"�� ��������."
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "��"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "�׽�Ʈ"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "��Ʈ(_t):"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "����"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "�ٽ� ã��"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "����"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "���� ����"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "����"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "���̾�α� ����"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "�̸���"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "������ ����"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "�� ������ ����"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "ȸ�� ����:"
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "����"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "�� â�� �ݽ��ϴ�"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "����"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "�� â�� �ݽ��ϴ�"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "����"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "�Ӹ���:"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "��"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "��� ������"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "�ٸ� ������ ǥ��"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "���� �ɼ�"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "ǥ��"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "�ݿ���"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "��"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " ���־�"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "�۾�"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "��Ÿ"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "������ �κ� ���"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution ��."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "�ڼ���"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "���� ���"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "���� ����"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution ��ġ"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "������ ��ġ�ҷ��� \"Ȯ��\", �������� \"���\"�� ��������."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolution ���ϵ��� ����� ��ġ�Ǿ��Ǿ����ϴ�."
-
-#: shell/e-setup.c:189
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "�̹��� evolution�� ó������ ���ô� ������?"
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Evolution ����� ������ ������ ��ġ�ϽǷ��� \"Ȯ��\"�� ��������"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6405,16 +9298,14 @@ msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %s"
 
-#: shell/e-setup.c:224
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"`%s'�� ������\n"
-"������ ���� �����ϴ�."
+msgstr "������ �д� ���� ���� �߻�"
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6422,7 +9313,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6430,7 +9330,58 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"`%s'�� ������\n"
+"������ ���� �����ϴ�."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "������ ����"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "������ �̵�"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "���� ����"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "%s ������ ����"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6439,41 +9390,139 @@ msgstr ""
 "���õ� ������ ������ �� �����ϴ�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "�����Ͻ� ������ �̸��� ���������ʽ��ϴ�"
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �� ���� ����"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:318
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "���ο�..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(�������)"
 
-#: shell/e-shell-view-menu.c:160
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s�� �������� ��\n"
+"������ %d�� ������."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"������ ������ ���ִ� ������ �����ϴ�\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "��������"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s�� ��������.\n"
+"%s�� �����մϴ�"
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s�� �������� ��\n"
+"������ 1�� ������."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "�ڵ�"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "���� �̸�:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "������ ��������"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "���� ����:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "���� ����"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�ý����� ��ο� Bug buddy�� ã���� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:195
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:197
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6483,34 +9532,71 @@ msgstr ""
 "����, ����ó ������ �ϴ� �׷���� �������α׷�\n"
 "���� �Դϴ�."
 
-#: shell/e-shell-view-menu.c:361
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "���� �̵�..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "�������ο��� �۾�"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "�������ο��� �۾�"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(ǥ�õ� ������ ����)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "����"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution��..."
 
-#: shell/e-shell-view.c:1125
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1127
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� �����Ҽ� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6519,15 +9605,15 @@ msgstr ""
 "��!! `%s' �䰡 ���� ���� �׾��׿� :-(\n"
 "%s ������Ʈ�� ����ϽŰ� �����ϴ�."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "�׷� �̸�:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6536,150 +9622,269 @@ msgstr ""
 "���� ����κ��� `%s'�׷���\n"
 "������ ����ðڽ��ϱ�?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "������������"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "���� ������(_S)"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "���� ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "ū ������(_L)"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "ū ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
+msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "�� �׷�(_N)..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "���� ���� ���߱�(_H)"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "���� ���븦 ����ϴ�"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Ȱ��"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "����"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "��Ģ �̸�: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:617 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "����(_V)"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "���� ����(_S)"
 
-#: shell/e-storage-set-view.c:617
-msgid "View the selected folder"
-msgstr "���õ� ���� ����"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "����ó(_C)"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(�̸� ����)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "���� ����"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "���� �̸��� ������ �̹� �����մϴ�"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "������ ���� ������ �ùٸ��� �ʽ��ϴ�"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "����� ����"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "������ ����⿡ ����� ������ ����"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:445
-msgid "Permission denied"
-msgstr "�㰡�� �ź�"
-
-#: shell/e-storage.c:447
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "�۵��� �������� ����"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution ��."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% �Ϸ�(_p):"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "���� ����"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "ȣ��Ʈ:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "���� �̸�:"
 
-#: shell/main.c:74
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "���� ����:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "���� ���� ���� �����ϼ���:"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Evolution���� ������ �������Ƿ��� \"��������\"�� ��������."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "��������"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "������������"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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:99
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6687,239 +9892,324 @@ msgstr ""
 "�����մϴ�\n"
 "Evolution ��\n"
 
-#: shell/main.c:130
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:176
-msgid "Disable."
+#: shell/main.c:215
+msgid "Disable splash screen"
+msgstr ""
+
+#: shell/main.c:216
+msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:196
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���뺸 ������Ʈ �ý����� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "����"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "�����Ѱ� ����"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "���ο� ����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "����ó�� �����"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "���ο� ����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "�"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "�ڸ���"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "����ó ã�ƺ���"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "�����Ѱ� �ڸ�"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "����ó�� �����"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "�� ����ó"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "����"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "���̱�"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Ŭ�����忡�� �ٿ��ֱ�"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "����ó�� �μ��մϴ�"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "���� ����"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "����ó�� �����"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "����"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "���"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "��� ����"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "��� ����ó ����"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "����ó(_C)"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "����ó(_C)"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "�μ�(_P)..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "����ó ã��(_S)"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "���� ����(_S)"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "����(_T)"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "�����"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "������ �����մϴ�"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
-msgstr ""
+#, fuzzy
+msgid "Create a New All-Day _Event"
+msgstr "���ο� ��Ӹ� �����"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "���ο� ��Ӹ� �����"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "�� �޷��� ����ϴ�"
+msgid "Create a new appointment"
+msgstr "���ο� ��Ӹ� �����"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "����"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "�ð������� �ڷ� ����"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "������ ������ ����"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "��¥�� �̵�(_D)"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "���÷� �̵�(_T)"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "������ ���� ����"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "���� �ð����� �̵�"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "��"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "�� ���"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "����"
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "�μ�� �޽����� �̸����ϴ�"
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "�޷� ����"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "����"
-
-#: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr "�޷� �μ��ϱ�"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "������ �޷��� �μ��մϴ�"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "�ٸ��̸����� ����"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "����� ����"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "�޷��� �ٸ� ������ �����մϴ�"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "�Ϸ羿 ����"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "�Ѵ޾� ����"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "���־� ����"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "����"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "��"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "���(_A)"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "���� ����(_M)..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "��(_M)"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "���ο�(_N)"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr "��(_W)"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "�޷� ����(_O)"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "�ݱ�"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "�ٸ��̸����� ����(_S)..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "�� ����� �ݽ��ϴ�"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
-msgstr "��(_W)"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "�� ����� �����մϴ�"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "�μ�� �޽����� �̸����ϴ�"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "�μ� �̸�����(_v)"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "�μ� ����"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "�� �׸��� �μ�"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "�μ�..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "������ ��ħ"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "����� �������� ���̾�α׸� �ݴ´�"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "�並 %s�� ����"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "�ൿ(_A)"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "����(_F)"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "�� �׸� �����մϴ�"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "����..."
 
@@ -6931,27 +10221,12 @@ msgstr "����"
 msgid "Print En_velope..."
 msgstr "���� �μ�(_v)..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "�� �׸��� �μ�"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "�μ�..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "�ٸ��̸����� ����(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "������ ��ħ"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "����� �������� ���̾�α׸� �ݴ´�"
@@ -6968,795 +10243,993 @@ msgstr "�¶��� ������ �����ش�"
 msgid "Send _message to contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "����(_F)"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "����(_S)"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "�� �������α׷��� ���Ͽ�"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "�� �׸� �����մϴ�"
+
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "�۾��� �������� ���̾�α׸� �ݴ´�"
+
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "�� ���α׷���..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "�ൿ(_n)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "���� ���"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "���(_l)"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "�޷� �ҷ����̱�"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "�ڸ���(_u)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "�� �޼����� �ٸ�������� �����մϴ�"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "���"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "������ �κ� ���"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "���� ���"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "�� ����� �ݽ��ϴ�"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "������ ����..."
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "����"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "�ൿ(_A)"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "�����Ѱ� ����"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "Evolution��..."
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "�ڸ���"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "��ҵ�"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "�����Ѱ� �ڸ�"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "���� ������ ����"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "�� ����� �����մϴ�"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "���� �ۼ�"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML�� ����"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "�� �޼����� �ۼ��մϴ�"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "��ĥ����: ������ ù°�׸�(_r)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "�۾�(_T) (��ĥ����)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "���� �׸����� �̵�"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "���� ��ȣ ������"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "���� �׸����� �̵�"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "�۾�(_T) (��ĥ����)"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "���� ����(_S)..."
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "����(_e)"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "���̱�"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "������ �ޱ�"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Ŭ�����忡�� �ٿ��ֱ�"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "�и� ������ ������ �� ������ �����´�"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "����(_v)"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "����"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "�μ� �̸�����(_v)"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "���� ���� ������(_E)..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "�μ� ����(_e)..."
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "���� �Ÿ���(_F)..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "�μ� ����"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "���� �޼���(_M)"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
-msgid "Save"
-msgstr "����"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "���� ����(_M)..."
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "����� �������� ���̾�α׸� �ݴ´�"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "�̸�����"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "���� ������ ����"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "������ �ޱ�(_S)"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "���õ� �޼��� ����(_S)"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "���� ����"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "��ü�� �����մϴ�"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "���õ� �޼��� ����(_S)"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "������ �޼��� ����(_D)"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "���� �޼��� ����(_R)"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "�� ���α׷���(_A)..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "���θ� ���� ������ ǥ��(_e)"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
-msgstr "�ݱ�(_C)"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "����(_C) (��ĥ����)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Ŭ�����忡�� �ٿ��ֱ�"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "����(_C)"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "�����(_D)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "���� ����(_A)"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "����(_H)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "��Ÿ�� ����(_T)"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "�� �޼����� �����մϴ�"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "���� �޽���(_M) (������)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "��� ����(_A)"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "������ �̵�(_M)..."
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "���̱�(_P)"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "�μ�(_P)"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "������ �޼��� ���"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "����(_E)"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "����(_F)"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "���� ����(_I)"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "����(_P)..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "���� ����(_S)"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "������ �޼��� ���"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
-msgstr "�۾�(_T) (��ĥ����)"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "�� �޼����� ���� ��� ������� ȸ���� �մϴ�"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "�޼����� �� ������ �����մϴ�"
+
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "�޽����κ��� ���� ���� ����(_V)"
+
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "�� ������ �ۼ��մϴ�"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "�� ����"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "���� �ۼ�"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "�� �޼����� �ۼ��մϴ�"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "�޼����� �� ������ �����մϴ�"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "��� �޽��� ��� ���̱�"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "�� �޼����� �����մϴ�"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "���ϸ� ����Ʈ������ ����"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: ui/evolution-mail.xml.h:13
-msgid "Forget _Passwords"
-msgstr "���� ��ȣ ������"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "����"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Full _Headers"
-msgstr "��� ��� ����(_H)"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide S_elected Messages"
-msgstr "���õ� �޼��� ����(_S)"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Hide _Deleted Messages"
-msgstr "������ �޼��� ����(_D)"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "�ٸ� �ּҷ� ����"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Hide _Read messages"
-msgstr "���� �޼��� ����(_R)"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Manage _Subscriptions..."
-msgstr "���� ����(_S)..."
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mar_k as Read"
-msgstr "���� ������ ǥ��(_k)"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mark All as R_ead"
-msgstr "���θ� ���� ������ ǥ��(_e)"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Mark as U_nread"
-msgstr "���� ���� ������ ǥ��(_n)"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "���޵� �޽���"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "�߿�"
+
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "���� ���� ������ ǥ��"
+
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "�̵�"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "�޼����� �� ������ �̵��մϴ�"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Print message to the printer"
-msgstr "�޽��� �μ�"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "����"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "�� �޼����� ����������� ȸ���� �մϴ�"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Reply to _All"
-msgstr "��ü ȸ��(_A)"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "�޼���"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "��Ÿ�� ����(_T)"
 
-#: ui/evolution-mail.xml.h:39
-msgid "S_ource"
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "�޼��� �μ�"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "������ �޼����� �μ��մϴ�"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "���� ����(_A)"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Select _Thread"
-msgstr "��Ÿ�� ����(_T)"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "����"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Send / Receive"
-msgstr "������ �ޱ�"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail.xml.h:43
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"�и� ������ ������\n"
-"  �� ������ �����´�"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Send queued mail and retrieve new mail"
-msgstr "�и� ������ ������ �� ������ �����´�"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Show _All"
-msgstr "��� ����(_A)"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Threaded Message list"
-msgstr "������ �޼��� ���"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "�μ� �̸�����"
 
-#: ui/evolution-mail.xml.h:49
-msgid "VFolder on Se_nder"
-msgstr "�߼��ڿ����� ��������(_n)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail.xml.h:50
-msgid "VFolder on _Recipients"
-msgstr "�����ڿ����� ��������(_R)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "ȸ��"
 
-#: ui/evolution-mail.xml.h:51
-msgid "VFolder on _Subject"
-msgstr "���񿡵��� ��������(_S)"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "��ü ȸ��"
 
-#: ui/evolution-mail.xml.h:52
-msgid "View Raw Message Source"
-msgstr "Raw �޽��� ����"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "���� �޼���(_M)"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Virtual Folder _Editor..."
-msgstr "���� ���� ������(_E)..."
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "�޼����� ������ ������ �����մϴ�"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Apply Filters"
-msgstr "�Ÿ��� ����(_A)"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Attachment"
-msgstr "÷��(_A)"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Compose"
-msgstr "����(_C)"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "��� ��� ����(_H)"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Copy to Folder..."
-msgstr "������ ����(_C)..."
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Create Filter From Message"
-msgstr "�޽����κ��� �Ÿ��� ����(_C)"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "�޼����� �� ������ �����մϴ�"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Expunge"
-msgstr "����(_E)"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "�޼����� ������ ÷���մϴ�"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Filters..."
-msgstr "���� �Ÿ���(_F)..."
+#: ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "����(_F)"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "���ϸ� ����Ʈ������ ����"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Forward"
-msgstr "����(_F)"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "�߼��ڿ����� ��������(_n)"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Inline"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "�����ڿ����� ��������(_R)"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "���� ����(_I)"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "���񿡵��� ��������(_S)"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Mail Message"
-msgstr "���� �޼���(_M)"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
+msgstr "�Ÿ��� ����(_A)"
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Mail Settings..."
-msgstr "���� ����(_M)..."
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "������ ����"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_Move to Folder..."
-msgstr "������ �̵�(_M)..."
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
+msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: ui/evolution-mail.xml.h:69
-msgid "_Open Selected Items"
-msgstr "���õ� �޼��� ����(_S)"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "���޵� �޽���"
 
-#: ui/evolution-mail.xml.h:71
-msgid "_Quoted"
-msgstr "�ο�(_Q)"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "ǥ��"
 
-#: ui/evolution-mail.xml.h:72
-msgid "_Reply"
-msgstr "ȸ��(_R)"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "������ �̵�"
 
-#: ui/evolution-mail.xml.h:73
-msgid "_Resend Messages"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "ǥ��"
+
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: ui/evolution-mail.xml.h:75
-msgid "_Send / Receive"
-msgstr "������ �ޱ�(_S)"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "�޼������� �ٽ� ������(_R)"
 
-#: ui/evolution-mail.xml.h:76
-msgid "_Threaded"
-msgstr "������ ǥ��(_T)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "�� â�� �ݽ��ϴ�"
 
-#: ui/evolution-mail.xml.h:78
-msgid "_Undelete"
-msgstr "�ǻ츲(_U)"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "�ݱ�(_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "����(_V)"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "÷��"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "���� ���� ����"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "���� ������ ��������"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "�� �޼����� PGP�� ��ȣȭ�մϴ�"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "����(_o)"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "�ؽ�Ʈ ���� ����"
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "�޼����� �ؽ�Ʈ�� ������ �����մϴ�"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "�ؽ�Ʈ ���� ����"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "������ ���ϴ�"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP ��ȣȭ"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP ����"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "�ʰ��� ����(_D)"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP ��ȣȭ"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "������ ����(_f)... (��ĥ����)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "����"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "�ٸ��̸����� ����"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "�ʰ��� ����(_D)"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "������ ����..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "���� ������ ����"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "���� ������ �ٸ��̸����� �����մϴ�"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "�޼����� ������ ������ �����մϴ�"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "����"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "���߿� ����(_L)"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "���߿� ����(_L)"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "������ HTML�������� ����"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "���߿� �޼����� �����ϴ�"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "���� �޼����� �����ϴ�"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "�� �޼����� ���� �����ϴ�"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "÷�ι� ����/����"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "÷�ι� ����(_a)"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "÷�ι� ����"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "�� �޼����� PGPŰ�� ������"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "�� �޼����� PGPŰ�� ������"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "���� ����C �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "���� �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "�߽� �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ȸ�� �ּ� �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "÷��(_A)"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "���� ���� �׸�(_B)"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "���� �׸�(_C)"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "�����(_D)"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "����(_D)"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "�߽� �׸�(_F)"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "�ؽ�Ʈ ���� ����(_I)... (��ĥ ����)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "����(_O)..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "ȸ�� �ּ� �׸�(_R)"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "����(_S)"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "����(_H)"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "����(_o)"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "����"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "���� ����"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "�ٽ� ã��"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "�����"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "�ٲٱ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "�ٲٱ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "��ü ȸ��(_l) (��ĥ ����)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "��ҵ�"
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "�۾��� �������� ���̾�α׸� �ݴ´�"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "�� ������ �����մϴ�"
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "�������"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "������ ���� ���"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "���(_A) (��ĥ����)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "���õ� �޼��� ����(_S)"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr ""
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "�� ������ �����մϴ�"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr ""
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "�� ������ �����մϴ�"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Ŭ�����忡�� �ٿ��ֱ�"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr ""
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "���� ����(_M)..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr ""
 
@@ -7764,271 +11237,491 @@ msgstr ""
 msgid "About Evolution..."
 msgstr "Evolution��..."
 
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "���� ����(_S)"
+
 #: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "�� â�� �ݽ��ϴ�"
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "�並 %s�� ����"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "������ ����"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr ""
+#: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "�� ������ ����"
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "�� ������ ����"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "�� �׸� �����մϴ�"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "�ٸ� ������ ǥ��"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "����(_x)"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ���� ����(_s)"
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
+msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution ��ġ"
+
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "���α׷��� ��Ĩ�ϴ�"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "�����ϱ�"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "%s��(��) �������� �̵�"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution�� ���� ����"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "���� ����"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "���� ����(_B)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddy�� ���������� �մϴ�"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "�߽� �׸��� ������ �������� ����"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "�޷� ����ϱ�(_C)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr "�������ο��� �۾�"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "���õ� ���� ����"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Evolution��(_A)..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "�ൿ(_A)"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "���(_A) (��ĥ����)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "����(_C) (��ĥ����)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "����(_C)"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "������ ����(_G)..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "����(_I)"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "���� �޼���(_M)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "�̵�"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "���ο�(_N)"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "�� ��������(_N)"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "����(_O)..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "���� ����(_S)"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "���� ����(_S)"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "�۾�(_T) (��ĥ����)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "�������ο��� �۾�"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "���� ����(_M)..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "�ּ� _2:"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "ȸ��"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "��ȭ ����"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "������"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "����"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "����"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "�޼���"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "���:"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "�ٻ�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "�繫�� ����"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "���� ����"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "����(_O)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "ȸ�� ���� �ð�(_s):"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "��� ������"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:259
+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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "����"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Ȯ��"
 
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "��"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "����"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "����"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "��Ÿ"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "����ó ������"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "���� �˻�"
 
-#: widgets/misc/e-filter-bar.c:311
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "��� ����"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "����..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "���"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "����"
+
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "����"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "�޼���"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "�˻�(_c)"
 
@@ -8040,16 +11733,373 @@ msgstr "���ο� �ּҷ� ����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS�� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:177
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:190
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "������ �����մϴ�"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "�޷� ����"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "����ó(_C)..."
+
+#~ msgid "_Company:"
+#~ msgstr "ȸ��(_C):"
+
+#~ msgid "Find..."
+#~ msgstr "�..."
+
+#~ msgid "Click here to add a contact"
+#~ msgstr "����ó�� �߰��ϱ�"
+
+#~ msgid "Open calendar"
+#~ msgstr "�޷� ����"
+
+#~ msgid "Save calendar"
+#~ msgstr "�޷� ����"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>�޷¸� �д� �� ����:<br>���������ʴ� ���"
+
+#~ msgid "Colors"
+#~ msgstr "����"
+
+#~ msgid "Highlight"
+#~ msgstr "����"
+
+#~ msgid "TaskPad"
+#~ msgstr "�۾��е�"
+
+#~ msgid "Edit Task"
+#~ msgstr "�۾� ����"
+
+#~ msgid "Percent complete"
+#~ msgstr "�ۼ�Ʈ �Ϸ�"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "�۾��� �Ϸ�Ǿ����� ǥ��"
+
+#~ msgid "Edit this task..."
+#~ msgstr "�� ������ ����..."
+
+#~ msgid "Edit the task"
+#~ msgstr "���� ����"
+
+#~ msgid "Go to Today"
+#~ msgstr "���÷� �̵�"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "�޷¿� �߰�"
+
+#~ msgid "Update Calendar"
+#~ msgstr "�޷� ����"
+
+#~ msgid "Attendee address"
+#~ msgstr "������ �ּ�"
+
+#~ msgid "Attendees: "
+#~ msgstr "������:"
+
+#~ msgid "Organizer: "
+#~ msgstr "��ȹ��:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "��� �⺻"
+
+#~ msgid "_Starting date:"
+#~ msgstr "���� ��¥(_S):"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "URL `%s'�� ����ε� ���������� ������ �����ʽ��ϴ�"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "URL `%s'���ִ� ��Ʈ ��ȣ�� ���ڰ� �ƴմϴ�"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP ������ ���캾�ϴ�"
+
+#~ msgid "Inline attachment"
+#~ msgstr "÷��"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "����� ���� ������ �ƴϳ׿�."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "������ �ֱ���ѵ� ���� ���� ���׿�."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "������ ������ �ִ� �Ű�����ѵ� �� ���� �����ϴ�."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "������ ���� ũ�׿�(100k�� ����).\n"
+#~ "�����ϰ� �����Ű� �³���?"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "�⺻ �׳� ���α׷����� %s�� ����"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "�⺻ �׳� �������� %s�� ����"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s�� �̸��� ������"
+
+#~ msgid "Run %s"
+#~ msgstr "%s ����"
+
+#~ msgid "Close %s"
+#~ msgstr "%s �ݱ�"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "%s��(��) ���� �ٷ� �̵�"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "%s��(��) ���� �ٷ� �̵�"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML ������ �� ���� �����ϴ�:\n"
+#~ "%s"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ���"
+
+#~ msgid "Update automatically"
+#~ msgstr "�ڵ����� ����"
+
+#~ msgid "Remove criterion"
+#~ msgstr "���� ����"
+
+#~ msgid "Forward to Address"
+#~ msgstr "������ �ּ�"
+
+#~ msgid "Mark as Read"
+#~ msgstr "���� ������ ǥ��"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "������ �̵�..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "������ ����..."
+
+#~ msgid "Advanced"
+#~ msgstr "����"
+
+#~ msgid "Email address:"
+#~ msgstr "���ڿ��� �ּ�:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "���� ����"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "���� ���� Druid"
+
+#~ msgid "Password:"
+#~ msgstr "��й�ȣ:"
+
+#~ msgid "Remember my password"
+#~ msgstr "�� ��й�ȣ ���"
+
+#~ msgid "Reply address:"
+#~ msgstr "ȸ�� �ּ�:"
+
+#~ msgid "Save password"
+#~ msgstr "��ȣ ����"
+
+#~ msgid "Server type:"
+#~ msgstr "���� ����::"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr "�� ������ ����ų �̸��� �����ϼ���.���� \"����\"�̳� �Ǵ� \"��\"."
+
+#~ msgid "minutes."
+#~ msgstr "��"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
+
+#~ msgid "Closing current folder"
+#~ msgstr "���� ���� �ݴ���"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "���� ������ �ٸ� �̸����� �ٲپ ����"
+
+#~ msgid "Copying messages"
+#~ msgstr "�޼��� ����"
+
+#~ msgid "Do you accept?"
+#~ msgstr "�޾Ƶ��̰ڽ��ϱ�?"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (���޵� �޽���)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "����: (���� ����)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "���޵� �޽��� (���� ����)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----���� �޽���-----<br><b>���� ���:</b> %s<br><b>�޴� ���:</b> "
+#~ "%s<br><b>����:</b> %s<br>"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution ���ϵ��� ����� ��ġ�Ǿ��Ǿ����ϴ�."
+
+#~ msgid "Activate"
+#~ msgstr "Ȱ��"
+
+#~ msgid "Find a contact"
+#~ msgstr "����ó ã�ƺ���"
+
+#~ msgid "View All"
+#~ msgstr "��� ����"
+
+#~ msgid "View all contacts"
+#~ msgstr "��� ����ó ����"
+
+#~ msgid "5 Days"
+#~ msgstr "�����"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "�� �޷��� ����ϴ�"
+
+#~ msgid "Open Calendar"
+#~ msgstr "�޷� ����"
+
+#~ msgid "Prev"
+#~ msgstr "����"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "�޷��� �ٸ� ������ �����մϴ�"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "�޷� ����(_O)"
+
+#~ msgid "About this application"
+#~ msgstr "�� �������α׷��� ���Ͽ�"
+
+#~ msgid "About..."
+#~ msgstr "�� ���α׷���..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "�ൿ(_n)"
+
+#~ msgid "C_lear"
+#~ msgstr "���(_l)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "������ ����..."
+
+#~ msgid "Dump XML"
+#~ msgstr "XML�� ����"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "��ĥ����: ������ ù°�׸�(_r)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "�۾�(_T) (��ĥ����)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "���� �׸����� �̵�"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "���� �׸����� �̵�"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "�۾�(_T) (��ĥ����)"
+
+#~ msgid "N_ext"
+#~ msgstr "����(_e)"
+
+#~ msgid "Pre_vious"
+#~ msgstr "����(_v)"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "�μ� ����(_e)..."
+
+#~ msgid "Select everything"
+#~ msgstr "��ü�� �����մϴ�"
+
+#~ msgid "_About..."
+#~ msgstr "�� ���α׷���(_A)..."
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "���� �޽���(_M) (������)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "������ �̵�(_M)..."
+
+#~ msgid "New Mail"
+#~ msgstr "�� ����"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "�޽��� �μ�"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "�и� ������ ������\n"
+#~ "  �� ������ �����´�"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Raw �޽��� ����"
+
+#~ msgid "_Compose"
+#~ msgstr "����(_C)"
+
+#~ msgid "_Reply"
+#~ msgstr "ȸ��(_R)"
+
+#~ msgid "_Threaded"
+#~ msgstr "������ ǥ��(_T)"
+
+#~ msgid "Send the message now"
+#~ msgstr "���� �޼����� �����ϴ�"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "�ؽ�Ʈ ���� ����(_I)... (��ĥ ����)"
+
+#~ msgid "Redo"
+#~ msgstr "�����"
+
+#~ msgid "Replace a string"
+#~ msgstr "�ٲٱ�"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "��ü ȸ��(_l) (��ĥ ����)"
+
+#~ msgid "Undo"
+#~ msgstr "�������"
+
+#~ msgid "Undo the last action"
+#~ msgstr "������ ���� ���"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution ���� ����(_s)"
 
+#~ msgid "Advanced ..."
+#~ msgstr "����..."
diff --git a/po/lt.po b/po/lt.po
index 4722f09b6a..1b6b1897b6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10\n"
-"POT-Creation-Date: 2001-05-05 17:29+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-05 01:02+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -13,11 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Gamykla importuoti GnomeCard byloms � Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importuoja GnomeCard bylas � Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kortel�: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +35,7 @@ msgstr ""
 "\n"
 "Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +43,7 @@ msgstr ""
 "\n"
 "  Prie�d�lis: "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +51,7 @@ msgstr ""
 "\n"
 "  Vardas:     "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +59,7 @@ msgstr ""
 "\n"
 "  Papildomas: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +67,7 @@ msgstr ""
 "\n"
 "  Pavard�:    "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +75,7 @@ msgstr ""
 "\n"
 "  Gal�n�:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +83,7 @@ msgstr ""
 "\n"
 "Gimimo data:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +91,7 @@ msgstr ""
 "\n"
 "Adresas:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,13 +99,13 @@ msgstr ""
 "\n"
 "  Pa�to d���:  "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -103,7 +113,7 @@ msgstr ""
 "\n"
 "  Gatv�:       "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -111,7 +121,7 @@ msgstr ""
 "\n"
 "  Miestas:     "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -119,7 +129,7 @@ msgstr ""
 "\n"
 "  Regionas:    "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -127,7 +137,7 @@ msgstr ""
 "\n"
 "  Pa�to kodas: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -135,13 +145,13 @@ msgstr ""
 "\n"
 "  Valstyb�:    "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -149,7 +159,7 @@ msgstr ""
 "\n"
 "Telefonai:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -157,7 +167,7 @@ msgstr ""
 "\n"
 "Telefonas:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -165,7 +175,7 @@ msgstr ""
 "\n"
 "El. pa�tas:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -173,7 +183,7 @@ msgstr ""
 "\n"
 "El. pa�tas:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -181,7 +191,7 @@ msgstr ""
 "\n"
 "Pa�to programa: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -189,7 +199,7 @@ msgstr ""
 "\n"
 "Laiko juosta: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -197,7 +207,7 @@ msgstr ""
 "\n"
 "Geogr. vietov�: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -205,7 +215,7 @@ msgstr ""
 "\n"
 "Verslo pad�tis: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -213,7 +223,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -221,31 +231,31 @@ msgstr ""
 "\n"
 "  Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -253,7 +263,7 @@ msgstr ""
 "\n"
 "Kategorijos: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -271,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -279,7 +289,7 @@ msgstr ""
 "\n"
 "Unikali eilut�: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -287,27 +297,25 @@ msgstr ""
 "\n"
 "Vie�as raktas: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Gamykla importuoti GnomeCard byloms � Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Keletas lai�k�"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importuoja GnomeCard bylas � Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "�vesk %s slapta�od�"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Negal�jau inicializuoti Bonobo"
 
@@ -320,14 +328,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ne�kelta\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Negal�jau paleisti wombat serverio"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Negal�jau paleisti wombat"
 
@@ -336,728 +344,848 @@ msgstr "Negal�jau paleisti wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution adres� knygel�s konduito konfig�ravimo �rankis\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolution kontakt� tvarkymo komponentas."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Adres� knygel�s adreso vaizduokl�s gamykla"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Adres� knygel�s adreso ???? gamykla"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution adres� knygel�s komponento gamykla."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Paspausk �ia, jei reikia adres� knygel�s"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP serveris"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Byla"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Ne�inomas adres� knygel�s tipas"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Jokio (anoniminis re�imas)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Slapta�odis"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Ne�inomas auth tipas"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Pagrindas"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Vienas"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Submedis"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Prisiminti �� slapta�od�"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Hostas:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Prievadas:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Paie�kos sritis:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Kelias:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Sukurti keli� jei jis neegzistuoja."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Redaguoti adres� knygel�"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Prid�ti adres� knygel�"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Pasirink tavo turimos adres� knygel�s tip�, ir �vesk reikiam� informacij� "
+"apie j�."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Vardas:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Apra�ymas:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Prid�ti"
+msgid "Addressbook Sources"
+msgstr "Adres� knygel�s �altinis"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "I�trinti"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Vardas"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Prid�ti"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "K_eisti"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Kiti kontaktai"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "�vesk %s slapta�od�"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Negaliu atidaryti adres� knygel�s"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Bet kuriame lauke yra"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Varde yra"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "El. pa�te yra"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Varde yra"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, kur� rodys Aplank� nar�ykl�"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Pagrindinis el. pa�tas"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "El. pa�tas 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "El. pa�tas 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Pasirink byl�"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Sukurti nauj� kontakt�"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Redaguoti adres� knygel�"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Keisti kontakto informacij�"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Prid�ti prie kontakt�"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "El. pa�to adresas:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "U�drausti u�klausas"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Leisti u�klausas (Pavojinga!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution adres� knygel�s vard� pasirinkimo s�saja."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+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:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Pa�alinti"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Pa�alinti visus"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Pa�to siuntimas"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Kiti kontaktai"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Lai�ko gav�jai"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Pasirink vardus"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Pasirink vard� i�:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Ie�koti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Jubiliejus:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "V_erslo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Verslo _faksas"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontaktai..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorijos..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontakto redaktorius"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detal�s"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Byloje kaip:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Paprastas"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Pas_tabos:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizacija:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefon� tipai"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Pagrindinis el. pa�tas"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Nori gauti _HTML lai�kus"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Tinklapio adresas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Prid�ti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresas..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Asistento vardas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Gimtadienis:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Verslo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Kompanija:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontaktai..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:639 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_I�trinti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamentas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Pilnas vardas..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Nam�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Pareigos:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Vadybininko vardas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobilus"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Ofisas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesija:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "S_utuoktinis:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Tai yra pa�to adresas"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "I�trinti kontakt�?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "�is kontaktas priklauso �ioms kategorijoms:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistento"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Verslo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Verslo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Verslo faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Atsakiklis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Automobilio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Kompanijos"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Nam�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Nam� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Nam� faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobilus"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Ie�kas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Pagrindinis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "El. pa�tas 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "El. pa�tas 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "I�trinti kontakt�?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas prid�jimas"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Redaguoti vis�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "El. pa�tas"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresas _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Patikrinti adres�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Valst_yb�:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Suomija"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "JAV"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Valstija/Provincija:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/Pa�to kodas:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tikrinti piln� vard�"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Vardas:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Pavard�:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Vi_durinis:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Gal�n�:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titulas:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Rodyti _ma�as korteles"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Rodyti _lentel�"
-
-#: addressbook/gui/component/addressbook.c:407
-#, c-format
-msgid "Enter password for %s"
-msgstr "�vesk %s slapta�od�"
-
-#: addressbook/gui/component/addressbook.c:435
-msgid "Unable to open addressbook"
-msgstr "Negaliu atidaryti adres� knygel�s"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Mes negal�jome atidaryti �ios adres� knygel�s. Tai\n"
-"rei�kia arba tai, kad tu �vedei neteising� URI, arba \n"
-"bandei prieiti prie LDAP serverio, bet neturi \n"
-"�kompiliuoto LDAP palaikymo. Jei tu �vedei URI, \n"
-"pasitikrink URI teisingum� ir �vesk i� naujo. Jei ne, \n"
-"tikriausiai bandei prieiti prie LDAP serverio. Jei nori\n"
-"naudoti LDAP, tu turi parsisi�sti ir �diegti OpenLDAP,\n"
-"o tada perkompiliuoti ir �diegti Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Show All"
-msgstr "Rodyti visus"
-
-#: addressbook/gui/component/addressbook.c:565
-msgid "Advanced..."
-msgstr "I�sami..."
-
-#: addressbook/gui/component/addressbook.c:595 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Bet kuriame lauke yra"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Name contains"
-msgstr "Varde yra"
-
-#: addressbook/gui/component/addressbook.c:597
-msgid "Email contains"
-msgstr "El. pa�te yra"
-
-#: addressbook/gui/component/addressbook.c:740
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, kur� rodys Aplank� nar�ykl�"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP serveris"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Byla"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Ne�inomas adres� knygel�s tipas"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Jokio (anoniminis re�imas)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Slapta�odis"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Ne�inomas auth tipas"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Pagrindas"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Vienas"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Submedis"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Hosto vardas:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Gruodis"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Prisiminti �� slapta�od�"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Hostas:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Prievadas:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Pa�alinti"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Kontakto redaktorius"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Kontakto redaktorius"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Paie�kos sritis:"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autentikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Kelias:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Sukurti keli� jei jis neegzistuoja."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Redaguoti adres� knygel�"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Prid�ti adres� knygel�"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Pasirink tavo turimos adres� knygel�s tip�, ir �vesk reikiam� informacij� "
-"apie j�."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Vardas:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Apra�ymas:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adres� knygel�s �altinis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "I�trinti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Keisti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Vardas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "U�drausti u�klausas"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Leisti u�klausas (Pavojinga!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Keisti kontakto informacij�"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Prid�ti prie kontakt�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adres� knygel�s konduito konfig�ravimo �rankis\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolution kontakt� tvarkymo komponentas."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Adres� knygel�s adreso vaizduokl�s gamykla"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Adres� knygel�s adreso ???? gamykla"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution adres� knygel�s komponento gamykla."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Paspausk �ia, jei reikia adres� knygel�s"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Pa�alinti"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Pa�alinti visus"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adres� knygel�s vard� pasirinkimo s�saja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Rasti..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Lai�ko gav�jai"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Pasirink vardus"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Pasirink vard� i�:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Paie�ka"
 
@@ -1169,156 +1297,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "I�saugoti kaip vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Si�sti kontakt� kitam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Spausdinti vok�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Klaida �keliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "�altiniai"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Ne�inoma klaida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Dirbti atsijungus"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Pri�jimas u�draustas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Byla nerasta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Veiksmas nepalaikomas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Nutraukta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O klaida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Klaida �keliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Klaida �keliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Klaida �keliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Klaida �keliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Klaida skaitant duomenis:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Spausk �ia, kad prid�tum kontakt� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Byloje kaip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "El. pa�tas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Pagrindinis telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Asistento telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Verslo telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Atsakiklio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Nam� telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Verslo adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Nam� adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Verslo telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Nam� telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Kitas telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Kitas adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Tinklapis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamentas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Ofisas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titulas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Vadybininkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Pravard�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Pastaba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Laisvas-u�si�m�s URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Baigta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "�keliamas kalendorius..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "I�saugoti � adres� knygel�"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1362,7 +1588,8 @@ msgid "Dimensions:"
 msgstr "I�matavimai:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "�riftas..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1422,7 +1649,6 @@ msgid "Margins"
 msgstr "Para�t�s"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Stulpeli� skai�ius:"
 
@@ -1502,37 +1728,63 @@ msgstr "Tipas:"
 msgid "Width:"
 msgstr "Plotis:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "�riftas..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negal�jau perskaityti piloto ToDo programos bloko"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Priminti man apie �vyk� "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "U�tildyti"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution pa�to komponento."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Gerai"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduokl�"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution komponentas tvarkyti kalendoriui."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Kalendoriaus ap�valgos komponento gamykla."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution kalendoriaus komponento gamykla."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution kalendoriaus komponento gamykla."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1542,143 +1794,257 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Rodyti informacij� apie Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Persp�jimas bus %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "U�daryti"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "U�tildyti"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "U�tildymo laikas (minut�mis)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Keisti �vyk�"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "N�ra jokios ap�valgos."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Priminti man apie �vyk� "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "U�tildyti"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Gerai"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Negal�jau inicializuoti GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Negal�jau inicializuoti Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Byla nerasta"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %Y m. %B %e d."
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Atidaryti kalendori�"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "I�saugoti kalendori�"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: calendar/gui/calendar-commands.c:586
 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:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Vie�as"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Asmeni�kas"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ne�inomas"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:691
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Auk�tas"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normalus"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "�emas"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Skaidrus"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Neskaidrus"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Neprad�ta"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "U�baigta"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Nutraukta"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1689,23 +2055,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Klasifikacija turi b�ti �Vie�as�, �Asmeni�kas�, �Slaptas� arba �Joks�"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1715,118 +2085,294 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentin� reik�m� turi b�ti tarp 0 ir 100 imtinai"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioritetas turi b�ti �Auk�tas�, �Normalus�, ��emas� arba �Neapibr��tas�."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Neapibr��tas"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Skaidrumas turi b�ti �Skaidrus�, �Neskaidrus� arba �Joks�"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %Y m. %B %e d."
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Korteli� vaizdas"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "�vykiai"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Darb_o savait�"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%H:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Apibr��ti vaizdus"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "U�duotys"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "M�nesis"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Klaida �keliant kalendori�</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, kur� rodys kalendorius"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Klaida �keliant kalendori�:</b>Metodas nepalaikomas"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Persp�jimai garsu"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Vaizdavimas"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Lai�ko gav�jai"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Rodyti �vykius"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Vaizdavimo parinktys"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Rodyti u�duotis"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "K� reikia nuveikti"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "�keliamas kalendorius"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, kur� rodys kalendorius"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Persp�jimas bus %A, %Y %b %d, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Lai�ko ro_dymas"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Prane�imas apie tavo �vyk� %A, %Y %b %d, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Groti gars�"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "N�ra jokios ap�valgos."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "U�daryti"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Paleisti program�"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Keisti �vyk�"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "U�tildymo laikas (minut�mis)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dien�"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Atnaujinti kas "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "valand�"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minu�i�"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d dien�"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 diena"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d savai�i�"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 savait�"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d valand�"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 valanda"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minu�i�"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minut�"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d sekund�i�"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 sekund�"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Groti gars�"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Rodyti visas lai�ko antra�tes"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Pasi�sti lai�k�"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Paleisti program�"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " prie� �vykio prad�i�"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " po �vykio prad�ios"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " prie� �vykio pabaig�"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " po �vykio pabaigos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Pagrindas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data ir laikas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Priminimas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Ap�valga:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Parinktys"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "po"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "prie�"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dien�(as)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "�vykio pabaig�"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "valand�(as)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minut�(es)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "�vykio prad�i�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1857,36 +2403,38 @@ msgid "60 minutes"
 msgstr "60 minu�i�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Persp�jimai baigiasi po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Persp�jimai garsu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pyptel�ti, kai atsiranda aliarmo langai."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Kalendoriaus nuostatos"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Spalvos"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Suspausti savaitgalius"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Dat� navigatorius parinktys"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1894,583 +2442,1085 @@ msgid "Defaults"
 msgstr "�prastai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vaizdavimo parinktys"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Vaizdavimas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Kada reikia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Leisti u�tildym�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dienos pabaiga:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Pirma savait�s diena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Pary�kinti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "�iandienos �vykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "�iandienos �vykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "�vykius, kurie dar ne �iandien"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "�vykiai, kurie dar ne �iandien:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Pra�jusius �vykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Pra�j� �vykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Pasirink spalv�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Svarbumas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Pra�jusius �vykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Priminti man apie visus �vykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Priminimas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "�e�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "�e�tadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Rodyti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Rodyti �vyki� pabaigos laikus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Rodyti savai�i� numerius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Dienos prad�ia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Sek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
 msgstr "U�duotys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "�iandienos �vykius"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Ket"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Lik�s laikas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titulas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Laiko dalijimas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Laiko formatas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Laiko juosta: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Ant"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Persp�jimai vaizdu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Darbo savait�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Darb_o savait�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutes prie� jiems �vykstant."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "sekund�i�."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ar tu tikrai nori i�trinti u�duot� �%s�?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ar tu tikrai nori i�trinti �urnalo �ra�� �%s�?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "U�baigta"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "U�baigta"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Kada reikia"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Keisti �vyk�"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "�vykis -- %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "U�duotis -- %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "�urnalo �ra�as -- %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "N�ra ap�valgos"
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "U�ra�yti byl�?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Byla tokiu vardu jau yra.\n"
+"U�ra�yti j�?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "I�saugoti kaip..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, 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:82
+#: calendar/gui/dialogs/delete-comp.c:96
 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:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, 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:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ar tu tikrai nori i�trinti �� bevard� �urnalo �ra��?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ar nori i�saugoti pakeitimus?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Ar tu tikrai nori i�trinti �vyk� �%s�?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Keisti u�duot�"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Ar tu tikrai nori i�trinti u�duot� �%s�?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "N�ra ap�valgos"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Ar tu tikrai nori i�trinti �urnalo �ra�� �%s�?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "�vykis -- %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Pasirink byl�"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "U�duotis -- %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Skyriai:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "�urnalo �ra�as -- %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Laiko juosta: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% u�_baigta:"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "�vykis"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Priminimas"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Pasikartojimas"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "At�aukti susitikim�"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Vis_os dienos �vykis"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasifikacija"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data ir laikas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "U�baigimo data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "As_meni�kas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Pa�anga"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "_Vie�as"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "P_rad�ios data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Sa_ntrauka:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "U�duotis"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Slaptas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontaktai..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "P_abaigos laikas:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Kada reikia:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Prad�ios laikas:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Svarbumas:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_B�sena:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grup�s pavadinimas:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Kategorijos"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "�altinis"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Pirmininkas"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "B�tinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Neb�tinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Ne dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Pa�alinti veiksm�"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Priimti "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Atmesti "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "I�trintas"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Vykdoma"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Automobilio telefonas"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "B�tinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Neb�tinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Ne dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "I�si�sta"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "I�trinti..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Pabaigos data"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "I�trintas"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Prad�ios data"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "I�trintas"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Geografin� vietov�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Vadybininkas"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Procent� u�baigta"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Gruodis"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Ap�valga"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Skaidrumas"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rol�"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "B�sena"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Persp�jimai"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipas"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Spausk �ia, kad prid�tum u�duot�"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizatorius:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizatorius:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Pakv_iesti kitus..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizatorius:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %Y %b %d"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "lygiai"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "diena"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "-�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "kart�(us) pasitaikys"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Kitoks pakartojimas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Kas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "I�imtys"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Jokio pakartojimo"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Per�i�ra"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Pakartojimo taisykl�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Paprastas pakartojimas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Keisti"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "kol"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "am�inai"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "m�nes�(ius)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "iki"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "savait�(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "U�baigimo data:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "I�trintas"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "I�trintas"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Joks"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "U�duotis"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% u�_baigta:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Pa�anga"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "P_rad�ios data:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Kada reikia:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Svarbumas:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_B�sena:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Pa�ym�ti u�baigta"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Pa�ym�ti, jog u�duotis u�baigta"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "Keisti �i� u�duot�..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopijuoti"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Keisti �i� u�duot�"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "�_d�ti"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Pa�ym�ti u�baigta"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "I�trinti �i� u�duot�"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Pa�ym�ti u�baigta"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "I�trinti u�duot�"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Spausk �ia, kad prid�tum u�duot�"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% u�_baigta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Persp�jimai"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorijos"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "U�baigta"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "U�baigimo data"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Kada reikia"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Pabaigos data"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografin� vietov�"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Svarbumas"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Prad�ios data"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Ap�valga"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "U�duotys"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Skaidrumas"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a, %b %d"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b %d"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Naujas visos dienos �vykis"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Eiti � �iandien�"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Eiti � �ia_ndien�"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Eiti � dat�..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Atidaryti"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "I�trinti �� �vyk�"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "�ra�yti susitikim� � dienotvark�"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Leisti perkelti �� pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "I�trinti �� pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "I�trinti visus pasitaikymus"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minu�i� padalos"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "A� negal�jau atnaujinti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Tai yra pa�to adresas"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Komponentas s�kmingai atnaujintas."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Buvo klaida �keliant kalendoriaus byl�."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "A� negal�jau atidaryti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "A� negal�jau �kelti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "A� negal�jau skaityti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Tai atsakymas i� ka�ko, kas nebuvo pakviestas!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Negal�jau atnaujinti kalendoriaus saugyklos."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "A� negal�jau i�trinti kalendoriaus komponento!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Komponentas s�kmingai i�trintas."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "A� nepa��stu tokio kalendoriaus komponento tipo."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Prid�ti � kalendori�"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Priimti "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Atmesti "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Atnaujinti kalendori�"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "At�aukti susitikim�"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "A� negal�jau atnaujinti tavo kalendoriaus bylos!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "A� negal�jau atidaryti tavo kalendoriaus bylos!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2485,26 +3535,22 @@ msgstr "--kam--"
 msgid "Calendar Message"
 msgstr "Kalendoriaus �inut�"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "�keliamas kalendorius"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "�keliamas kalendorius..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizatorius:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serverio �inut�:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Ap�valga:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "pabaigos-data"
@@ -2513,419 +3559,48 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "prad�ios-data"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Dalyvio adresas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Dalyviai: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"At�aukti\n"
-"susitikim�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Pirmininkas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Susitikimo pakvietimai"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ne dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Neb�tinas dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizatorius: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Skelbti\n"
-"�vyk�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Papra�yti\n"
-"susitikimo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "B�tinas dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rol�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Laikas\n"
-"dienotvark�je"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1083
-msgid "Status"
-msgstr "B�sena"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Visi"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Negal�jau �kelti u�duo�i� � �%s�"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Keisti �vyk�"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "lygiai"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "diena"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr "-�"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "kart�(us) pasitaikys"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr " %d dien�"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 diena"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d savai�i�"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " 1 savait�"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d valand�"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 valanda"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minu�i�"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " 1 minut�"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekund�i�"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 sekund�"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Groti gars�"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Rodyti dialog�"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Pasi�sti lai�k�"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Paleisti program�"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " prie� �vykio prad�i�"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " po �vykio prad�ios"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " prie� �vykio pabaig�"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " po �vykio pabaigos"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %Y %b %d"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Vis_os dienos �vykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "�vykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "�vykio pagrindai"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Kitoks pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Kas"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "I�imtys"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Keisti"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Jokio pakartojimo"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Per�i�ra"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Pasikartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Pakartojimo taisykl�"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Priminimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Nuostatos..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Paprastas pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "P_abaigos laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Prad�ios laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Prad�ios data:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "po"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "prie�"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dien�(as)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "�vykio pabaig�"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "kol"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "am�inai"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "valand�(as)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minut�(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "m�nes�(ius)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "�vykio prad�i�"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "iki"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "savait�(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "metus"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Naujas �vykis..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "I�trinti visus pasitaikymus"
-
 #. 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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%B %e"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Rodyti visus "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Santraukoje yra"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "Apra�yme yra"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Komentare yra"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Turi kategorij�"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Naujas �vykis..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution pa�to komponento."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalendoriaus iTip/iMip vaizduokl�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponentas tvarkyti kalendoriui."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Kalendoriaus ap�valgos komponento gamykla."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution kalendoriaus komponento gamykla."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Balandis"
@@ -2947,232 +3622,256 @@ msgid "Go To Date"
 msgstr "Eiti � dat�"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Eiti � �iandien�"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Sausis"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Liepa"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Bir�elis"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Kovas"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Gegu��"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Lapkritis"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Spalis"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Eiti � �iandien�"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "�t"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "U�duotys"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Esama diena (%a, %Y %d %b)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Esama savait� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Esamas m�nuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Esami metai (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Spaudinio per�i�ra"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Spausdinti �� element�"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Spausdinimo nuostatos"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Vaizduojamo u�duo�i� aplanko URI"
 
@@ -3208,86 +3907,106 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SPATKP�"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Negaliu procesinti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Nepavyko lai�kas %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "U�baigta"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrin�jant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtr�: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paie�k�: %s: %s"
@@ -3323,14 +4042,33 @@ msgstr "Vykdoma u�klausa ne�inomai antra�tei: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Negal�jau sukurti pipe: %s"
+
+#: camel/camel-lock-client.c:123
+#, 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
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nepavyko �kelti %s: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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-movemail.c:219
+#: camel/camel-lock.c:151
 #, 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."
@@ -3345,114 +4083,109 @@ msgstr "Nepavyko gauti u�rakto naudojant fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Negal�jau patikrinti pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Negal�jau atidaryti pa�to bylos %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, 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:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Negal�jau patikrinti %s u�rakto bylos: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Klaida skaitant pa�to byl�: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Klaida �ra�ant laikin� pa�to byl�: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, 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:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Negal�jau sukurti pipe: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Nepavyko programa Movemail: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Ne�inoma klaida)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Klaida skaitant pa�to byl�: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Klaida kopijuojant laikin� pa�to byl�: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Pra�au �vesti tavo %s slapta�od� d�l %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Pra�au �vesti tavo %s slapta�od�"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Nepateiktas slapta�odis."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Negal�jau sukurti laikinos bylos: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Paspausk ant ikonos, kad i��ifruotum."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Nenurodyti jokie gav�jai"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3471,37 +4204,37 @@ msgstr "Nepavyko �kelti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nepavyko �kelti %s: Modulyje n�ra inicializacijos kodo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Jungtis nutraukta"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(ne�inomas hostas)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Serveris netik�tai atsijung�"
 
@@ -3606,7 +4339,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
@@ -3672,12 +4405,12 @@ msgstr "Virtuali� aplank� pa�to tiek�jas."
 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:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui �%s� n�ra tiek�jo."
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3686,11 +4419,61 @@ msgstr ""
 "Negal�jau sukurti katalogo %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "�iuk�l�s"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Pra�au �vesti tavo %s slapta�od� d�l %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Tokios bylos n�ra."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Tokios bylos n�ra."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Nepavyko serveriui nusi�sti vartotojo vardo"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Nepavyko lai�kas %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
 
 #: camel/camel-tcp-stream-ssl.c:348
 #, c-format
@@ -3711,28 +4494,17 @@ msgstr ""
 "Valstija: %s\n"
 "Valstyb�: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "N�ra tokio lai�ko: %s"
@@ -3741,64 +4513,75 @@ msgstr "N�ra tokio lai�ko: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Tu negali kopijuoti lai�k� i� �io �iuk�li� aplanko."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Negal�jau sukurti katalogo %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Netik�tas atsakymas i� IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Ne�inoma klaida"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baig�si per anksti."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Netik�tas atsakymas OK i� IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko �kelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
-msgstr "Skanuojamas IMAP aplankas"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "I�saugomi lai�kai"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "I�saugomi lai�kai"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Negal�jau sukurti katalogo %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
@@ -3806,7 +4589,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:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Aplankai"
 
@@ -3840,28 +4623,28 @@ msgstr ""
 "Su �ia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slapta�odis."
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:464
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:503
-#: camel/providers/smtp/camel-smtp-transport.c:402
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Tu ne�vedei slapta�od�io."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3871,36 +4654,51 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Pa�to laikymui MH tipo pa�to kataloguose"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standartin� Unix mailbox byla"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Vietinio pa�to laikymui standartiniu mbox formatu"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir formato pa�to bylos"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Vietinio pa�to laikymui qmail maildir kataloguose"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir formato pa�to bylos"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Vietinio pa�to laikymui qmail maildir kataloguose"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Saugyklos �aknis %s n�ra absoliutus kelias"
@@ -3940,24 +4738,24 @@ msgstr "Negal�jau i�trinti aplanko santraukos bylos �%s�: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 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:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, 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:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3966,18 +4764,19 @@ msgstr ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "N�ra tokio lai�ko"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Blogas lai�ko turinys"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3987,14 +4786,14 @@ msgstr ""
 "Negal�jau atidaryti aplanko �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "N�ra tokio aplanko �%s�."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4004,22 +4803,29 @@ msgstr ""
 "Negal�jau sukurti aplanko: �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "�%s� n�ra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negal�jau i�trinti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Negal�jau sukurti aplanko: �%s�:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4027,11 +4833,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
@@ -4041,9 +4849,12 @@ msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
 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:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4052,11 +4863,13 @@ msgstr ""
 "Negaliu gauti lai�ko: %s i� aplanko %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti lai�ko: Sugadinta pa�to d��ut�?"
 
@@ -4102,36 +4915,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Daroma aplanko santrauka"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Negal�jau atidaryti aplanko: %s: daroma santrauka nuo vietos %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Negal�jau padaryti aplanko santraukos: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sinchronizuojamas aplankas"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Negal�jau atidaryti aplanko santraukos darymui: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos: %s"
@@ -4140,21 +4962,28 @@ msgstr "Negal�jau atidaryti laikinos pa�to bylos: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, 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:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nepavyko ra�yti � laikin� pa�to d��ut�: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
@@ -4169,13 +4998,14 @@ msgstr "Negal�jau u�daryti laikino aplanko:  %s"
 msgid "Could not rename folder: %s"
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ne�inoma klaida: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Negal�jau pridurti lai�ko prie mh aplanko: %s: %s"
@@ -4190,39 +5020,93 @@ msgstr "�%s� n�ra katalogas."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Negaliu atidaryti MH katalogo kelio: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "�%s� n�ra paprasta byla."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "N�ra tokio aplanko �%s�."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Vietin�se saugyklose n�ra inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Vietin� pa�to byla %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Negal�jau atidaryti laikinos pa�to bylos %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Serveris atmet� vartotojo vard�"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Nepavyko serveriui nusi�sti vartotojo vardo"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Serveris atmet� vartotojo vard�/slapta�od�"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Lai�kas %s nerastas."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 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:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Negaliu i�saugoti grupi� s�ra�o bylos d�l %s: %s"
@@ -4235,17 +5119,17 @@ msgstr "USENET naujienos"
 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:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET naujienos per %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4253,8 +5137,8 @@ msgstr ""
 "Su �ia parinktimi NNTP serveryje bus autentikuojamasi paprasto teksto "
 "slapta�od�iu."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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"
@@ -4305,7 +5189,7 @@ msgstr "Palikti lai�kus serveryje"
 msgid "Delete after %s day(s)"
 msgstr "I�trinti po %s dienos(�)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4400,7 +5284,7 @@ msgid "No such folder `%s'."
 msgstr "N�ra tokio aplanko �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4453,7 +5337,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pa�to siuntimas per sendmail program�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4463,124 +5347,124 @@ msgstr ""
 "Pa�to siuntimui, prisijungiant prie nutolusio pa�to serverio naudojant "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaks�s klaida, komanda neatpa�inta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakses klaida parametruose arba argumentuose"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Komanda ne�gyvendinta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Komandos parametras ne�gyvendintas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Sistemos b�sena, arba sistemos pagalbos atsakymas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Pagalbos �inut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Paslauga pasiruo�usi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Service closing transmission channel"
 msgstr "Paslauga u�daro"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Pra�ytas pa�to veiksmas pavyko, u�baigtas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Pra�ytas veiksmas nutrauktas: klaida vykdant"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Tranzakcija nepavyko"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Nepateiktas slapta�odis."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Autentikacijos mechanizmas per silpnas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Pra�ytam autentikacijos mechanizmui b�tinas �ifravimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Laikina autentikacijos nes�km�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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:387
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:410
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4590,316 +5474,236 @@ msgstr ""
 "Negal�jau autentikuotis � SMTP server�.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pa�to siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:553
+#: camel/providers/smtp/camel-smtp-transport.c:563
 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:560
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:574
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Siun�iamas lai�kas"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 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:668
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:687
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO atsakymo klaida: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:720
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:735
-#: camel/providers/smtp/camel-smtp-transport.c:747
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentikacija"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:797
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Baig�si AUTH u�klausos laiko riba: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:823
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:842
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:867
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:886
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:917
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:936
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:951
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:988
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, 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:1073
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT atsakymo klaida: %s: nelemtinga"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 baitas"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bait�"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prisegti byl�"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Pa�alinti pa�ym�tus elementus i� pried� s�ra�o"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Prisegti pried�..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1083
-msgid "Attachment"
-msgstr "Priedas"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Priedo savyb�s"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Bylos vardas:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Vidinis priedas"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME tipas:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Si�sti kaip:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Negal�jau atidaryti para�o bylos %s: \n"
-"%s"
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "I�saugoti kaip..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Klaida i�saugant byl�: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Klaida �keliant byl�: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
-"Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
-
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"�is lai�kas nebuvo i�si�stas.\n"
-"\n"
-"Ar nor�tum i�saugoti jo pakeitimus?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Atidaryti byl�"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Tokios bylos n�ra."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Tai n�ra paprasta byla."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Byla yra, bet jos ne�manoma perskaityti."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ta byla atrod� pasiekiama, bet open(2) nepavyko."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Byla yra labai didel� (vir� 100K).\n"
-"Ar tu tikrai nori j� �terpti?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "�vyko klaida, beskaitant byl�."
 
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Sukurti lai�k�"
-
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
-msgstr "Negal�jau sukurti ra�ykl�s lango."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�vesk adresus, kurie gaus �io lai�ko carbon copy"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4907,329 +5711,277 @@ msgstr ""
 "�vesk adresus, kurie gaus �io lai�ko carbon copy, bet j� nesimatys lai�ko "
 "gav�j� s�ra�e."
 
-#: composer/evolution-composer.c:355
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
-"jokios asmenyb�s pa�to komponente."
-
-#: composer/evolution-composer.c:370
-msgid "Cannot initialize Evolution's composer."
-msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Prisegti byl�"
 
-#: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
 msgstr ""
+"Negal�jau atidaryti bylos �%s�: \n"
+"%s"
 
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "adreso kortel�"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "kalendoriaus informacija"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Klaida �keliant byl�: %s"
 
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "I�saugoti kaip..."
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %Y-%m-%d %H:%M"
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "�sp�jimas"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %Y-%m-%d %H:%M"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Klaida i�saugant byl�: %s"
 
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Klaida �keliant byl�: %s"
 
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
+"Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%H:%M:%S"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Klaida i�saugant byl�: %s"
 
-#: executive-summary/component/component-factory.c:152
+#: composer/e-msg-composer.c:1055
 #, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Negaliu inicializuoti Evolution pa�to komponento."
+msgid "Unable to retrieve message from editor"
+msgstr "Negal�jau parsi�sti lai�ko i� POP serverio %s: %s"
 
-#: executive-summary/component/e-summary.c:926
-#, c-format
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Unable to seek on file: %s\n"
 "%s"
 msgstr ""
-"Negaliu atidaryti HTML bylos:\n"
-"%s"
+"Negaliu sukurti i�vesties bylos: %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:940
-#, c-format
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Unable to truncate file: %s\n"
 "%s"
 msgstr ""
-"Klaida skaitant duomenis:\n"
-"%s"
+"Negaliu sukurti i�vesties bylos: %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
+"Klaida i�saugant lai�kus �: %s:\n"
+" %s"
 
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Pasirink paslaug�"
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution rado Pine pa�to byl�.\n"
+"Ar nor�tum jas importuoti � Evolution?"
 
-#: executive-summary/component/e-summary-callbacks.c:290
+#: composer/e-msg-composer.c:1321
 msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
+"This message has not been sent.\n"
 "\n"
-"Just leave it blank for the default"
+"Do you wish to save your changes?"
 msgstr ""
-"Tu gali pasirinkti kit� HTML puslap� Executive Summary fonui.\n"
+"�is lai�kas nebuvo i�si�stas.\n"
 "\n"
-"Tiesiog palik tu��i�, jei tenkina �prastinis fonas"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Atidaryti %s su �prasta GNOME programa"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Atidaryti %s su �prasta GNOME nar�ykle"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Si�sti lai�k� � %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Pakeisti rodin� � %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Paleisti %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "U�daryti %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Perkelti %s kair�n"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Perkelti %s de�in�n"
+"Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Perkelti %s � praeit� eilut�"
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
 
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Perkelti %s � kit� eilut�"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Atidaryti byl�"
 
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Konfig�ruoti %s"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "�terpti tekstin� byl�..."
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "I�vaizda"
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Sukurti lai�k�"
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fonas:"
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: executive-summary/component/main.c:62
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
+"Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
+"jokios asmenyb�s pa�to komponente."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#: composer/evolution-composer.c:374
+msgid "Cannot initialize Evolution's composer."
+msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF ap�valgos gamykla."
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "adreso kortel�"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF ap�valga"
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "kalendoriaus informacija"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Testinio bonobo komponento gamykla."
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Testinio komponento gamykla."
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%H:%M:%S"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testin� bonobo paslauga"
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testin� paslauga"
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Klaida"
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Atnaujinti automati�kai"
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Atnaujinti dabar"
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %Y-%m-%d"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Atnaujinti kas "
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minu�i�"
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %Y-%m-%d"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "metai"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "met�"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "m�nesis"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "m�nesi�"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "savait�"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "savai�i�"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dien�"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "valanda"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "valand�"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut�"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekund�"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekund�i�"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Vaje. Tu u�mir�ai pasirinkti dat�."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Vaje. Tu pasirinkai blog� dat�."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5238,7 +5990,7 @@ msgstr ""
 "Lai�ko data bus palyginta su esamu laiku, kai\n"
 "paleid�iamas filtras ar atidaromas vAplankas."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5246,7 +5998,7 @@ msgstr ""
 "Lai�ko data bus palyginta su laiku,\n"
 "kur� tu nurodai �ia."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5257,28 +6009,36 @@ msgstr ""
 "pavyzd�iui, �prie� savait�."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "esamas laikas"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "tavo nurodytas laikas"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "laikas, santykinis esamam laikui"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Palyginti su"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "dabar"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<spausk �ia, kad pasirinktum dat�>"
 
@@ -5303,8 +6063,8 @@ msgstr ""
 "Vaje, tu pamir�ai pasirinkti aplank�.\n"
 "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Pasirink aplank�"
 
@@ -5316,46 +6076,6 @@ msgstr "�vesk aplanko URI"
 msgid "<click here to select a folder>"
 msgstr "<spausk �ia, kad pasirinktum aplank�>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Keisti filtrus"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Keisti vAplankus"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gaunamas"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Siun�iamas"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtual�s aplankai"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "tik nurodyti aplankai"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vAplank� �altiniai"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "su visais aktyviais nutolusiais aplankais"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "su visais vietiniais aplankais"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5377,36 +6097,88 @@ msgstr "Taisykl�s pavadinimas:"
 msgid "Untitled"
 msgstr "Bevard�"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "�vykdyti veiksmus"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "jei visos s�lygos tenkinamos"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Prid�ti s�lyg�"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "siun�iamas"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Prid�ti"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Keisti"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Keisti filtrus"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Keisti vAplankus"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Gaunamas"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Siun�iamas"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtual�s aplankai"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "tik nurodyti aplankai"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vAplank� �altiniai"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "su visais aktyviais nutolusiais aplankais"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "su visais vietiniais aplankais"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Priskirti spalv�"
 
 #: filter/libfilter-i18n.h:4
@@ -5482,90 +6254,91 @@ msgid "Expression"
 msgstr "I�rai�ka"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Persi�sti adresu"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Svarbus"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "yra didesnis u�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "yra ma�esnis u�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Lai�kas buvo gautas"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Lai�kas buvo i�si�stas"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "tuo metu arba po"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "tuo metu ar prie�"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Skaitytas"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Gav�jai"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1083
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Dydis"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "skamba pana�iai �"
@@ -5586,7 +6359,8 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1084
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Tema"
 
@@ -5614,189 +6388,275 @@ msgstr "Keisti taisykl�"
 msgid "Score Rules"
 msgstr "�ver�io taisykl�s"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importuoti"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "Pa�tas"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution rado Elm pa�to byl�.\n"
+"Ar nor�tum jas importuoti � Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Elm pa�tas"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Prid�ti adres� knygel�"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution rado Netscape pa�to byl�.\n"
+"Ar nor�tum jas importuoti � Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_Nuostatos"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution rado Netscape pa�to byl�.\n"
+"Ar nor�tum jas importuoti � Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution rado Pine pa�to byl�.\n"
+"Ar nor�tum jas importuoti � Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Pine pa�tas"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution komponentas pa�tui tvarkyti."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution pa�to ra�ykl�."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Evolution pa�to komponento."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution pa�to aplanko vaizdavimo komponentas."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution pa�to aplanko gamyklos komponentas."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution ra�ykl�s komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution pa�to komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Pa�to ap�valgos komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Pa�to nustatymas"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Savyb�s..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Pakeisti bylos savybes"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
-#: mail/folder-browser.c:267
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "�%s� savyb�s"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Savyb�s"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Negal�jau sukurti laikino katalogo: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "�ra�yti paie�k� kaip vAplank�"
 
-#: mail/folder-browser.c:575 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:578 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:581 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:584 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:608
-msgid "_Open"
-msgstr "Ati_daryti"
-
-#: mail/folder-browser.c:610
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Dar kart� si�sti"
 
-#: mail/folder-browser.c:612 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "I�_saugoti kaip..."
 
-#: mail/folder-browser.c:614 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Atsakyti _visiems"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:625
-msgid "Forward _inline"
-msgstr "Persi�sti v_iduje"
-
-#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:630 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Svarbus"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Pa�ym�ti neskaitytu"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti � aplank�..."
 
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "S_ugr��inti"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Prid�ti adres� knygel�"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:655
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtras pagal Konferencij�"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:797
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "�%s� savyb�s"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Savyb�s"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponentas pa�tui tvarkyti."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution pa�to ra�ykl�."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Evolution pa�to komponento."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution pa�to aplanko vaizdavimo komponentas."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution pa�to aplanko gamyklos komponentas."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution ra�ykl�s komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution pa�to komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Pa�to ap�valgos komponento gamykla."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution rado Elm pa�to byl�.\n"
-"Ar nor�tum jas importuoti � Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm pa�tas"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Gamykla importuoti mbox byloms � Evolution"
@@ -5813,26 +6673,6 @@ msgstr "Gamykla importuoti Outlook Express 4 byloms � Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importuoja Outlook Express 4 bylas � Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution rado Netscape pa�to byl�.\n"
-"Ar nor�tum jas importuoti � Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution rado Pine pa�to byl�.\n"
-"Ar nor�tum jas importuoti � Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine pa�tas"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Esamas saugyklos formatas:"
@@ -5867,37 +6707,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "Tu ne�vedei visos b�tinos informacijos."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution s�skait� tvarkykl�"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Para�as:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"�is lai�kas nebuvo i�si�stas.\n"
+"\n"
+"Ar nor�tum i�saugoti jo pakeitimus?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (�prasta)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "I�jungti"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "�jungti"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Sugr��inti"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Padaryti �i� s�skait� �prastine"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution s�skait� tvarkykl�"
 
@@ -5965,37 +6837,45 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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:354
+#: mail/mail-callbacks.c:410
 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:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Persi�stas lai�kas:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, 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:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6003,7 +6883,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6011,31 +6891,24 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Ar tu tikrai nori taisyti visus %d lai�kus?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "U�ra�yti byl�?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Byla tokiu vardu jau yra.\n"
-"U�ra�yti j�?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6044,23 +6917,24 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtrai..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, 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.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Jungiamasi prie serverio..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6105,10 +6979,14 @@ msgstr ""
 "bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution s�skait� meistras"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Jungiamasi prie serverio..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Patikrinti, kokie tipai palaikomi "
@@ -6118,34 +6996,64 @@ msgid " color"
 msgstr " spalva"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "S�skaita"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "S�skaitos informacija"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "S�skaitos tvarkymas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "S�skaitos"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Priedas"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Sukurti"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6160,164 +7068,280 @@ msgstr ""
 "\n"
 "Paspausk �Baigti�, kad i�saugotum nuostatas."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Juodra��iai"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Juodra��i� aplankas:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Keisti"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "El. pa�to adresas:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "�jungti"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Pilnas vardas:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Para�as:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Pary�kinti citatas su "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_Viduje"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Pa�to d��ut�s formatas"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Padaryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Pa�ym�ti lai�kus skaitytais po:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP serveris"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Naujienos"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Neb�tina informacija"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Pasirink spalv�"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Cituojant"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "B�tina informacija"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Saugumas"
+
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Select PGP binary"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "�prastai si�sti lai�kus HTML formatu."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "I�si�sta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "I�si�st� lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Serverio tipas:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Serveris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Para�o byla:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "�altinis"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "N�ra informacijos"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "�altiniai"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Ypatingi aplankai"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standartin� Unix mbox"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipas"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Naudoti saugi� jungt� (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Vartotojo vardas:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6327,163 +7351,246 @@ msgstr ""
 "\n"
 "Spausk �Tolyn�, kad prad�tum."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "K_eisti"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "sekund�i�."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Negal�jau prisijungti prie POP serverio %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Negal�jau sukurti ra�ykl�s lango."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Negal�jau sukurti katalogo %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Negal�jau sukurti ra�ykl�s lango."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Negal�jau sukurti ra�ykl�s lango."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Negal�jau sukurti laikino katalogo: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "I�saugoti � disk�..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Atidaryti su %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "�i�r�ti viduje"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "I�orin� �i�rykl�"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�i�r�ti viduje (per %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Sl�pti"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "I�orin� �i�rykl�"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "�keliamas lai�ko turinys"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopijuoti adres� (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "I�saugoti kaip (FIXME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Kopijuoti adres� (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "I�saugoti kaip..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d sekund�i�"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "�keliamas lai�ko turinys"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "El. pa�to adresas:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Nuo"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Atsakyti-kam:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Kam"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "N�ra jokios PGP/GPG programos."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "U��ifruotas lai�kas neparodytas"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "U��ifruotas lai�kas"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Paspausk ant ikonos, kad i��ifruotum."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 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:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 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:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodykl� � vietin� byl� (%s), galiojanti svetain�je �%s�"
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Rodykl� � FTP svetain� (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Atidaromas �%s�"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Pakeisti aplanko �%s� format� � �%s�"
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Perkonfig�ruojamas aplankas"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "U�daromas esamas aplankas"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Pervadinamas senas aplankas ir atidaromas"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Kuriamas naujas aplankas"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Kopijuojami lai�kai"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6492,7 +7599,7 @@ msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6500,7 +7607,17 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Tu negali kopijuoti lai�k� i� �io �iuk�li� aplanko."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Konfig�ruoti %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6509,7 +7626,7 @@ msgstr ""
 "Klaida �%s� metu:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6518,101 +7635,105 @@ msgstr ""
 "Klaida vykdant veiksm�:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Dirbama"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution pa�anga"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siun�iamas �%s�"
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Siun�iamas lai�kas"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas lai�kas %d i� %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "U�baigta."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopijuojama"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "�iuk�l�s"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Atidaromas aplankas %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Perkonfig�ruojamas aplankas"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "I�valomas aplankas"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas lai�kas %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Gaunami lai�kai"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Gaunamas lai�kas numeris %d i� %d (uid �%s�)"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "I�saugomi lai�kai"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6621,12 +7742,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "I�saugomas lai�kas %d i� %d (uid �%s�)"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6635,11 +7751,11 @@ msgstr ""
 "Klaida i�saugant lai�kus �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "I�saugomas priedas"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6648,231 +7764,193 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negal�jau �ra�yti duomen�: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Ie�koti"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Bevardis)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Keletas lai�k�"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Taisyti lai�k�"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Taisyti lai�k�"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Persi�sti"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Rasti"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Kelias:"
+
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Siun�iamas ir gaunamas pa�tas"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Gaunamas"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Siun�iamas"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Nepilnas lai�kas sura�ytas � pipe!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Pa�to ap�valga"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Vartotojas nutrauk� veiksm�."
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Negal�jau sukurti laikinos mbox �%s�: %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (persi�stas lai�kas)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (be temos)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persi�stas lai�kas - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Persi�stas lai�kas (be temos)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Persi�sti lai�kai"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Persi�sti lai�kai"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Atsakyti"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "Atsakyti �io lai�ko siunt�jui"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Atsakyti visiems"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "Atsakyti visiems �io lai�ko gav�jams"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Persi�sti"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Persi�sti �� lai�k�"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Spausdinti parinkt� lai�k�"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "I�trinti �� lai�k�"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Praeitas"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Praeitas lai�kas"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Kitas"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Kitas lai�kas"
-
-#: mail/message-list.c:679
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematyt� lai�k�"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Keletas lai�k�"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "�emiausias"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "�emesnis"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Auk�tesnis"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Auk��iausias"
 
-#: mail/message-list.c:943
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "�iandien %H:%M"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:971
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "I�saugomi lai�kai"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1084
-msgid "From"
-msgstr "Nuo"
-
-#: mail/message-list.c:1084
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Gautas"
 
-#: mail/message-list.c:1085
-msgid "To"
-msgstr "Kam"
-
-#: mail/message-list.c:1085
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Dydis"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "Vartotojas nutrauk� veiksm�."
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Aplankas"
 
@@ -6900,15 +7978,1454 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%s�"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Tvarkyti u�sakymus"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Negaliu inicializuoti Evolution pa�to komponento."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "�vykiai"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Rodyti �vykius"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%H:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %H:%M"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Pa�to ap�valga"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution �diegimas"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Buvo klaida �keliant kalendoriaus byl�."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Klaida �keliant kalendori�</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Rodyti u�duotis"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Skyriai:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %Y m. %B %e d."
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Nepavyko atspausdinti lai�ko"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "I�valyti"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "I�jungti"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Pastaba"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Pas_tabos:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Egzistuoja"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "�altiniai"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "m�nesis"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "�emiausias"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Bandyti"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "�emiausias"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Rodyti"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Apra�yme yra"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Rasti v�l"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "dabar"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Atnaujinti dabar"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Apra�yme yra"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Pa�tas"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Pagrindinis el. pa�tas"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Pa�to gavimas"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Ne�inoma autentikacijos b�sena."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Ne�inoma klaida"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Susitikimo pakvietimai"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Egzistuoja"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Sta�ias lapas"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Konferencija"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "U�daryti �� lang�"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "�vertis"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Rodyti u�duotis"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "U�daryti �� lang�"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Si�sti"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Antra�t�"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dien�"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Rugpj�tis"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "K� reikia nuveikti"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "K� reikia nuveikti"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Atsakytas"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Aplankai"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Visi dalyviai"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Rodyti aplankus, prasidedan�ius:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Vaizdavimo parinktys"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Vaizdavimas"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Penktadienis"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Tre�iadienis"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "m�nesis"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 savait�"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Laikas\n"
+"dienotvark�je"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Rodyti u�duotis"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "su visais aktyviais nutolusiais aplankais"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Rodyti u�duotis"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "U�duotys"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Kitas"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Tikrinti nuostatas"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Balandis"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution apvalkalas."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detal�s"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "At�aukti susitikim�"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Ypatingi aplankai"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution �diegimas"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6916,28 +9433,24 @@ msgstr ""
 "�iai naujai Evolution versijai reikia �diegti papildom� byl�\n"
 "� tavo asmenin� Evolution katalog�"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 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:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Evolution bylos s�kmingai �diegtos."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Atrodo, kad tai pirmas kartas, kai tu pasileidai Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Pra�om paspausti �Gerai�, kad �diegtum Evolution vartotojo bylas �"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6948,16 +9461,14 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Negaliu kopijuoti byl� �\n"
-"�%s�."
+msgstr "�vyko klaida, beskaitant byl�."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6968,7 +9479,16 @@ msgstr ""
 "Pra�au, perkelk j�, kad gal��iau �diegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6979,21 +9499,58 @@ msgstr ""
 "Evolution katalogas. Pra�au, perkelk j�, kad \n"
 "gal��iau �diegti Evolution vartotojo bylas."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Negal�jau gauti aplanko �%s�: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Negaliu kopijuoti byl� �\n"
+"�%s�."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Kopijuoti � aplank�"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Vaje!  �%s� rodinys netik�tai numir�.  :-(\n"
-"Tikriausiai tai rei�kia, kad %s komponentas nul��o."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Perkelti � aplank�"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "I�trinti po %s dienos(�)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Ar tu tikrai nori i�trinti u�duot� �%s�?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Atidaromas aplankas %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7002,15 +9559,15 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Nurodytas aplanko vardas yra negalimas."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution -- Sukurti nauj� aplank�"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7018,41 +9575,133 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "pra�yt�jam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Joks aplankas nerodomas)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Pasirink byl�, kuri� nori importuoti � Evolution, ir pasirink jos tip� i� "
+"s�ra�o.\n"
+"\n"
+"Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
+"susigaudyti pati."
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importuojama %s\n"
+"Importeris nepasiruo��s.\n"
+"Laukiu 5 sekundes kol bandysiu v�l."
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importuojama %s\n"
+"Importuojamas elementas %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"N�ra importerio, kuris gal�t� suprasti\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importuojama"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importuojama %s.\n"
+"Pradedama %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Klaida �keliant %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importuojama %s\n"
+"Importuojamas elementas 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automati�kas"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Bylos vardas:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Pasirink byl�"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Bylos tipas:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Pasirink aplank�"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7062,31 +9711,88 @@ msgstr ""
 "pa�tui, kalendoriams ir kontakt� tvarkymui\n"
 "GNOME darbo aplinkoje."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Eiti � aplank�..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Sukurti nauj� trumpi� grup�"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Dirbti prisijungus"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Klaida i�saugant trumpes."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Joks aplankas nerodomas)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Vaje!  �%s� rodinys netik�tai numir�.  :-(\n"
+"Tikriausiai tai rei�kia, kad %s komponentas nul��o."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Grup�s pavadinimas:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7095,119 +9801,202 @@ msgstr ""
 "Ar tu tikrai nori pa�alinti grup�\n"
 "�%s� i� trumpi� juostos?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Nepa�alinti"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Pa�alinti �i� trumpi� grup�"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Pa�alinti �i� trumpi� grup�"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Ma�os ikonos"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip ma�as ikonas"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Didel�s ikonos"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nauja grup�..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Pa�alinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Pa�alinti �i� grup�..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Pa�alinti �i� trumpi� grup�"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Su�adinti"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Pa�alinti �i� trumpi� grup�"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Su�adinti �i� trump�"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Atidaryti"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Atidaryti naujame lange"
+
+#: shell/e-shortcuts-view.c:476
+#, 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:479
+#, fuzzy
+msgid "Rename"
+msgstr "Taisykl�s pavadinimas:"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Pa�alinti �i� trumpi� grup�"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Klaida i�saugant trumpes."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Trumpi� juosta"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontaktas"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Be pavadinimo)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Pri�jimas u�draustas"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Rodinys"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Rodyti parinkt� aplank�"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% u�_baigta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Bet kuriame lauke yra"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Hostas:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7221,107 +10010,6 @@ msgstr "Aplanko tipas:"
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplank�:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution apvalkalas."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Pasirink byl�, kuri� nori importuoti � Evolution, ir pasirink jos tip� i� "
-"s�ra�o.\n"
-"\n"
-"Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
-"susigaudyti pati."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importuojama %s\n"
-"Importeris nepasiruo��s.\n"
-"Laukiu 5 sekundes kol bandysiu v�l."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importuojama %s\n"
-"Importuojamas elementas %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"N�ra importerio, kuris gal�t� suprasti\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importuojama"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importuojama %s.\n"
-"Pradedama %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Klaida pradedant %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Klaida �keliant %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importuojama %s\n"
-"Importuojamas elementas 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automati�kas"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Bylos vardas:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Pasirink byl�"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Bylos tipas:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importuoti"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spausk �Import�, kad prad�tum importuoti byl� � Evolution."
@@ -7343,26 +10031,36 @@ msgstr ""
 "Sveikas atvyk�s � Evolution importavimo priemon�.\n"
 "�is meistras pad�s tau importuojant i�orines bylas � Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importuoti"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Nepa�alinti"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Kit� kart� nebeklausti"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7385,7 +10083,7 @@ msgstr ""
 "Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
 "laukiame tavo prisid�jimo!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7393,237 +10091,325 @@ msgstr ""
 "A�i�\n"
 "Evolution komanda\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/main.c:184
+#: shell/main.c:215
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopijuoti"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Kopijuoti pa�ym�jim�"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Sukurti nauj� kontakt�"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "I�trinti kontakt�"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Sukurti nauj� kontakt�"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Rasti"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "I�kirpti"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Rasti kontakt�"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "I�kirpti pa�ym�jim�"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "I�trinti kontakt�"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Naujas kontaktas"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Per�i�r�ti lai�k� prie� spausdinant"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Naujienos"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "�d�ti"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "�d�ti i� krep�io"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Per�i�r�ti kalendori� prie� spausdinant"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Spausdinti kontaktus"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Pa�ym�ti visus"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "I�trinti kontakt�"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Sustabdyti �k�lim�"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Rodyti visus"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Rodyti visus kontaktus"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Adres� knygel�s �altiniai..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Kontaktas"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Ie�koti kontakt�"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Pa�ym�ti _visk�"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "�ran_kiai"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Dienos"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Sutvarkyti kalendori�"
+#: ui/evolution-calendar.xml.h:2
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Konfig�ruoti adres� konduit�"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Sukurti nauj� visos dienos �vyk�"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Sukurti nauj� �vyk�"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Sukurti nauj� kalendori�"
+msgid "Create a new appointment"
+msgstr "Sukurti nauj� �vyk�"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Diena"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Eiti �"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Eiti � ankstesn� laik�"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Eiti � ateities laik�"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Eiti � _dat�"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Eiti � �ia_ndien�"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Eiti � nurodyt� dat�"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Eiti � dabartin� laik�"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "M�nesis"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Naujas �_vykis"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Atidaryti kalendori�"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Praeitas"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Naujas �vykis"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Per�i�r�ti kalendori� prie� spausdinant"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Spausdinti kalendori�"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Spausdinti �� kalendori�"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "I�saugoti kaip"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "B�tina informacija"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "I�saugoti kalendori� kaip ka�k� kit�"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Rodyti 1 dien�"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Rodyti 1 m�nes�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Rodyti 1 savait�"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Rodyti darbo savait�"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Dabar"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Darb_o savait�"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Savait�"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "�_vykis"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Pa�to nuostatos..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Diena"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_M�nesis"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Naujas"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Atidaryti kalendori�"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Savait�"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "U�daryti"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "U�daryti �� �vyk�"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "I�trinti �� �vyk�"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Pagrindin� �rankin�"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Per�i�r�ti lai�k� prie� spausdinant"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Spa_udinio per�i�ra"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Spausdinimo nuostatos"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Spausdinti �� element�"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Spausdinti..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "I�saugoti ir u�daryti"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "I�saugoti �vyk� ir u�daryti dialogo lang�"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Pakeisti rodin� � %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Veiksmai"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Byla"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "I�trinti �� element�"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "I�trinti..."
 
@@ -7635,27 +10421,12 @@ msgstr "Pagalba"
 msgid "Print En_velope..."
 msgstr "Spausdinti _vok�..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Spausdinti �� element�"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Spausdinti..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "I�saugoti _kaip..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "I�saugoti ir u�daryti"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "I�saugoti kontakt� ir u�daryti dialogo lang�"
@@ -7672,884 +10443,1005 @@ msgstr "Rodyti �inyn�"
 msgid "Send _message to contact..."
 msgstr "Si�sti _lai�k� kontaktui..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Byla"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "I�_saugoti"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Apie �i� program�"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "I�trinti �� element�"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Apie..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "I�saugoti u�duot� ir u�daryti dialogo lang�"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Veiksm_ai"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Si�sti ko_ntakt� kitam..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Adres� knygel�... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Si�sti _lai�k� kontaktui..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "I�va_lyti"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "At�aukti susitikim�"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_I�kirpti"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Keisti �io aplanko savybes"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Ti_krinti vardus (FIXME)"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Persi�sti kaip v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "I�valyti"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Persi�sti �� lai�k�"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "I�valyti pa�ym�jim�"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "U�daryti �� �vyk�"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Papra�yti\n"
+"susitikimo"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopijuoti � aplank�... (FIXME)"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "�traukti s_usitikim� � dienotvark�"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopijuoti"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "�ra�yti susitikim� � dienotvark�"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopijuoti pa�ym�jim�"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Veiksmai"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "I�kirpti"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "I�kirpti pa�ym�jim�"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Nutraukta"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "I�trinti �� �vyk�"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "I�saugoti esam� byl�"
+
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Sukurti"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Sukurti nauj� lai�k�"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "_Pirmas elementas aplanke (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "I�tu�tinti _�iuk�lin�"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "_Persi�sti (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Pa_mir�ti slapta�od�ius"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Persi�sti kaip v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Eiti � tolesn� element�"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Tvarkyti u�_sakymus..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Eiti � ankstesn� element�"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "_Neu�baigta u�duotis (FIXME)"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Perkelti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Pakeisti bylos savybes"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Si�sti / Gauti"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Kitas"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "�d�ti"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "�d�ti i� krep�io"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Praeitas"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Virtuali� aplank� taisymas..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Spa_udinio per�i�ra"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtrai..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Spausdinimo _nuostatos..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Pa�to lai�kas"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Spausdinimo nuostatos"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_Pa�to nuostatos..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "I�saugoti"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Per�i�ra"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "I�saugoti �vyk� ir u�daryti dialogo lang�"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Si�sti / Gauti"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "I�saugoti esam� byl�"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Keisti �io aplanko savybes"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "�traukti s_usitikim� � dienotvark�"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "I�trinti pa�ym�tus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "�ra�yti � dienotvark� ka�kok� susitikim�"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "I�trinti pa�ym�tus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Pa�ym�ti visus"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Pasl�pti pa�y_m�tus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Pa�ym�ti visk�"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Pasl�pti i�_trintus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Pasl�pti _skaitytus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "U�duoties p_ra�ymas (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Apie..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Pa�ym�ti _visus skaitytais"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_U�daryti"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontaktas (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "�d�ti i� krep�io"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopijuoti"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Perkelti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Derinti"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Pa�ym�ti _visus"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Pagalba"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Pa�ym�ti _gij�"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Elementas (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "�u_rnalo �ra�as (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "I�trinti pa�ym�tus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "P_askutinis elementas aplanke (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Rodyti _visus"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Pa�to lai�kas (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Per_kelti � aplank�... (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Pastaba (FIXME)"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "I�trinti pa�ym�tus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "�_d�ti"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Gijomis suskirstytas lai�k� s�ra�as"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "I�_valyti"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Aplankas"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Invertuoti pa�ym�jim�"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Savyb�s..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Pa�ym�ti _visk�"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Gijomis suskirstytas lai�k� s�ra�as"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_U�duotis (FIXME)"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "I�trinti pa�ym�tus lai�kus"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Neskaitytas elementas (FIXME)"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Atsakyti visiems �io lai�ko gav�jams"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Prid�ti paslaug�"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Atsakyti �io lai�ko siunt�jui"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Prid�ti nauj� paslaug� � Executive Summary"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "Kopijuoti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Sukurti nauj� lai�k�"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Naujas lai�kas"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Pritaikyti visus naujus filtrus lai�kams �ioje d��ut�je"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Keisti �io aplanko savybes"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Sukurti"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Sukurti nauj� lai�k�"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Konfig�ruoti aplank�..."
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Kopijuoti lai�k� � nauj� aplank�"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Kopijuoti pa�ym�tus lai�kus � kit� aplank�"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Atsakyti �io lai�ko siunt�jui"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr "Sukurti _virtual� aplank� i� lai�ko"
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Eiti � kit� lai�k�"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "I�trinti pa�ym�tus lai�kus"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Rodyti visas lai�ko antra�tes"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Taisyti lai�k�"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Taisyti esam� lai�k�"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Eiti � praeit� lai�k�"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "I�tu�tinti _�iuk�lin�"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Eiti � praeit� lai�k�"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "I�valyti"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Eiti � praeit� lai�k�"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtras pagal _Konferencij�"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtras pagal Siu_nt�j�"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtras pagal _Gav�jus"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtras pagal _Tem�"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Visi�kai i�trinti visus lai�kus, pa�ym�tus i�trintais"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Pa_mir�ti slapta�od�ius"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Persi�sti"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Persi�sti kaip"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Persi�sti viduje"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Persi�sti pa�ym�t� lai�k� ka�kam"
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-"Persi�sti pa�ym�t� lai�k� viduje tavo lai�ko, taip kad tu j� gali pakeisti"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "Pilnos _antra�t�s"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Eiti � kit� lai�k�"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Eiti � praeit� lai�k�"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "Persi�sti kaip"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Pasl�pti i�trintus lai�kus"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Persi�sti v_iduje"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "Pasl�pti pa�y_m�tus lai�kus"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Persi�sti v_iduje"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "Pasl�pti i�_trintus lai�kus"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Persi�sti pa�ym�t� lai�k� ka�kam"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "Pasl�pti _skaitytus lai�kus"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Persi�sti pa�ym�t� lai�k� ka�kam"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Invertuoti �ym�jim�"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Persi�sti pa�ym�t� lai�k� ka�kam"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Tvarkyti u�_sakymus..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Persi�sti pa�ym�t� lai�k� ka�kam"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Pa�ym�ti _visus skaitytais"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Persi�sti lai�kai"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Pa�ym�ti skaitytu"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Svarbus"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
-msgstr "Pa�ym�ti _neskaitytu"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Pa�ym�ti neskaitytu"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie nebuvo perskaityti"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie nebuvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Perkelti"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Perkelti lai�k� � nauj� aplank�"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Perkelti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Atidaryti naujame lange"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Kitas"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Kitas lai�kas"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Kitas lai�kas"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Pa�ym�ti _gij�"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Kitas lai�kas"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Atidaryti esam� lai�k� naujame lange"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Lai�ko spaudinio per�i�ra..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Pasirinktus lai�kus pa�ym�ti lyg jie buvo perskaityti"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Spausdinti lai�k� spausdintuvu"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Per�i�r�ti lai�k� prie� spausdinant"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Spausdinti lai�k�..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Praeitas"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Nukreipti (FIXME)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Praeitas lai�kas"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Atsakyti visiems"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Praeitas lai�kas"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Atsakyti siunt�jui"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Praeitas lai�kas"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "I_e�koti lai�ke"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Spausdinti lai�k�..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "�_altinis"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Spaudinio per�i�ra"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "I�saugoti lai�k� � nauj� byl�"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Spausdinti lai�k�"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Pa�ym�ti _visus"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Atsakyti"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "Pa�ym�ti _gij�"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Atsakyti visiems"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "Si�sti / Gauti"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "I_e�koti lai�ke"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Si�sti atsakym� asmeniui, kuris tau atsiunt� �� lai�k�"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "I�saugoti lai�k� � nauj� byl�"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Si�sti vien� lai�k�, kaip atsakym� � visus pa�ym�tus lai�kus"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"I�si�sti laukiant� pa�t�\n"
-"    ir parsi�sti nauj� pa�t�"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "Pilnos _antra�t�s"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "Rodyti _visus"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Data turi b�ti �vesta formatu: %s"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "Gijomis suskirstytas lai�k� s�ra�as"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Prisegti byl� prie �io lai�ko"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Sugr��inti pa�ym�tus lai�kus"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Sugr��inti"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "vAplankas pagal _Konferencij�"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "Rodyti neapdorot� lai�ko �altin�"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "vAplankas pagal Siu_nt�j�"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr "_Virtuali� aplank� taisymas..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "vAplankas pagal _Gav�jus"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "vAplankas pagal _Tem�"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Priedas"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Kopijuoti � aplank�"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtr� i� lai�ko"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "I�_valyti"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "_Filtrai..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Aplankas"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Persi�sti lai�kai"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "_Viduje"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Lai�ko ro_dymas"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invertuoti pa�ym�jim�"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Perkelti � aplank�"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "_Pa�to lai�kas"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Vaizdavimas"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "_Pa�to nuostatos..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "_V�l pasi�sti lai�kus"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "_Atidaryti pa�ym�tus lai�kus"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "_V�l pasi�sti lai�kus"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "_Cituojant"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "U�daryti �� lang�"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Atsakyti"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Prisitai_kyti �rankines..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "_V�l pasi�sti lai�kus"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Prisitaikyti"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "I�_saugoti lai�k� kaip..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Prisitaikyti �rankines"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "_Si�sti / Gauti"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_U�daryti"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_Gijomis"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Rodinys"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prisegti"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "U�daryti esam� byl�"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Pasirink para�o byl�"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "U��ifruoti �� lai�k� su PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormatas"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "�terpti tekstin� byl�..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "�terpti byl� � lai�k� kaip tekst�"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "�terpti tekstin� byl�..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Atidaryti byl�"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP u��ifruoti"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP pasira�yti"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "I�saugoti juo_dra�t�"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP u��ifruoti"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "I�saugoti � _aplank�... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "I�saugoti"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "I�saugoti kaip"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "I�saugoti juo_dra�t�"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "I�saugoti � aplank�..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "I�saugoti esam� byl�"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "I�saugoti esam� byl� kitokiu vardu"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "I�saugoti lai�k� � nurodyt� aplank�"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Si�sti"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Si�sti v�_liau"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Si�sti v�_liau"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Si�sti lai�k� HTML formatu"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Si�sti lai�k� v�liau"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Si�sti lai�k� dabar"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Si�sti �� lai�k� dabar"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Rodyti/sl�pti priedus"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Rodyti _priedus"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Rodyti priedus"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Pasira�yti �� lai�k� tavo PGP raktu"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Pasira�yti �� lai�k� tavo PGP raktu"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Perjungia, ar BCC laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Perjungia, ar CC laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Perjungia, ar Nuo pasirinkimas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Perjungia, ar Atsakyti kam laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Priedas"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Bcc laukas"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Cc laukas"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Derinti"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_I�trinti"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Nuo laukas"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "�terpt_i"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "�terpt_i tekstin� byl�... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Saugumas"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Pagalba"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Prid�ti aplank� � u�sakyt� aplank� s�ra��"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Aplankas"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Atnaujinti s�ra��"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Atnaujinti aplank� s�ra��"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Pa�alinti aplank� i� u�sakyt� aplank� s�ra�o"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "U�sakyti"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Atsisakyti"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Priski_rti u�duot� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Rasti v�l"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Susitikimo _pra�ymas (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Pakartoti"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Pakartoti at�aukt� veiksm�"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Pakeisti"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Pakeisti eilut�"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Atsakyti _visiems (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Si�s_ti b�senos ataskait� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Praleisti pasi_kartojim� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "I�saugoti u�duot� ir u�daryti dialogo lang�"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "V�l ie�koti tos pa�ios eilut�s"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Ie�koti eilut�s"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "At�aukti"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nauja u�duotis"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "At�aukti paskutin� veiksm�"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "I�trinti u�duot�"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "�_vykis (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Atnaujinti s�ra��"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Pa�ym�ti u�baigta (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Konfig�ruoti adres� konduit�"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Atsakyti (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_Atidaryti pa�ym�tus lai�kus"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Sukurti nauj� u�duot�"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "I�trinti u�duot�"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "I�trinti u�duot�"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nauja u�duotis"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "�d�ti i� krep�io"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "I�saugoti u�duot� kaip ka�k� kit�"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "U�duo�i� nuostatos..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Pa�to nuostatos..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_U�duotis"
 
@@ -8557,132 +11449,220 @@ msgstr "_U�duotis"
 msgid "About Evolution..."
 msgstr "Apie Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "U�daryti �� lang�"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Prisitai_kyti �rankines..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Trumpi� juosta"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Prisitaikyti"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Keisti �io aplanko savybes"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Prisitaikyti �rankines"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Kopijuoti � aplank�"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Kuriamas naujas aplankas"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Kuriamas naujas aplankas"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "I�trinti �� element�"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Parodyti kit� aplank�"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "I_�eiti"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _Langas"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "Evolution juostos _trump�"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "I�eiti i� programos"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Susipa�inimas"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importuoti i�orin� byl�"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Pagrindin� �rankin�"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Perkelti pa�ym�tus lai�kus � kit� aplank�"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Atidaryti naujame lange"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Atidaryti esam� lai�k� naujame lange"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Rodyti informacij� apie Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "I�si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "I�_si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Prane�ti apie klaid�, naudojant Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Rol�"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplank� juost�"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpi� juost�"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Perjungia, ar Nuo pasirinkimas yra rodomas"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "K_ontakt� mened�erio naudojimas"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Kalendoriaus vartojimas"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "_Pa�to programos naudojimas"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Dirbti atsijungus"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Rodyti parinkt� aplank�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Apie Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Veiksmai"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "�_vykis (FIXME)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontaktas (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopijuoti"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Aplank� juosta"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importuoti byl�..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indeksas"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Pa�to lai�kas"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Perkelti"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Naujas"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Atidaryti..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Trumpi� juosta"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_U�duotis (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Dirbti atsijungus"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Pa�to nuostatos..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Adres� kortel�s"
 
 #: views/addressbook/galview.xml.h:2
@@ -8713,9 +11693,12 @@ msgstr "Lai�kai"
 msgid "With Category"
 msgstr "Su kategorija"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %Y m. %B %e"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8789,59 +11772,137 @@ msgstr "Susitikimo pa_baigos laikas:"
 msgid "All Attendees"
 msgstr "Visi dalyviai"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y m. %B %e"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PATKP�S"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Dabar"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Dabar"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Gerai"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Data turi b�ti �vesta formatu: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "savait�"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "�iuk�l�s"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Neb�tinas"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nauja"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Ne�inoma klaida: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Kitas"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Kontakto redaktorius"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "I�sami paie�ka"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Rodyti visus"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "I�sami..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8852,6 +11913,10 @@ msgstr "Informacija"
 msgid "Warning"
 msgstr "�sp�jimas"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Klaida"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Klausimas"
@@ -8865,7 +11930,7 @@ msgstr "�inut�"
 msgid "Don't show this message again."
 msgstr "Kit� kart� neberodyti �ios �inut�s."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Pai_e�ka"
 
@@ -8889,8 +11954,637 @@ msgstr "init_corba(): negal�jau inicializuoti GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
-#~ msgid "You must be working online to complete this operation"
-#~ msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Sutvarkyti kalendori�"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "U�duo�i� nuostatos..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontaktai..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Kompanija:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Rodyti _ma�as korteles"
+
+#~ msgid "As _Table"
+#~ msgstr "Rodyti _lentel�"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Mes negal�jome atidaryti �ios adres� knygel�s. Tai\n"
+#~ "rei�kia arba tai, kad tu �vedei neteising� URI, arba \n"
+#~ "bandei prieiti prie LDAP serverio, bet neturi \n"
+#~ "�kompiliuoto LDAP palaikymo. Jei tu �vedei URI, \n"
+#~ "pasitikrink URI teisingum� ir �vesk i� naujo. Jei ne, \n"
+#~ "tikriausiai bandei prieiti prie LDAP serverio. Jei nori\n"
+#~ "naudoti LDAP, tu turi parsisi�sti ir �diegti OpenLDAP,\n"
+#~ "o tada perkompiliuoti ir �diegti Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Rasti..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Atidaryti kalendori�"
+
+#~ msgid "Save calendar"
+#~ msgstr "I�saugoti kalendori�"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Klaida �keliant kalendori�:</b>Metodas nepalaikomas"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Persp�jimai baigiasi po"
+
+#~ msgid "Colors"
+#~ msgstr "Spalvos"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Leisti u�tildym�"
+
+#~ msgid "Highlight"
+#~ msgstr "Pary�kinti"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "�iandienos �vykiai:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "�vykius, kurie dar ne �iandien"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "�vykiai, kurie dar ne �iandien:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Pra�j� �vykiai:"
+
+#~ msgid "TaskPad"
+#~ msgstr "U�duotys"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Lik�s laikas"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Persp�jimai vaizdu"
+
+#~ msgid "Work week"
+#~ msgstr "Darbo savait�"
+
+#~ 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"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Keisti �i� u�duot�..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Keisti �i� u�duot�"
+
+#~ msgid "Go to Today"
+#~ msgstr "Eiti � �iandien�"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "I�trinti visus pasitaikymus"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Komponentas s�kmingai atnaujintas."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "A� negal�jau �kelti tavo kalendoriaus bylos!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "A� negal�jau skaityti tavo kalendoriaus bylos!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Tai atsakymas i� ka�ko, kas nebuvo pakviestas!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Negal�jau atnaujinti kalendoriaus saugyklos."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "A� negal�jau i�trinti kalendoriaus komponento!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Komponentas s�kmingai i�trintas."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "A� nepa��stu tokio kalendoriaus komponento tipo."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Prid�ti � kalendori�"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Atnaujinti kalendori�"
+
+#~ msgid "Attendee address"
+#~ msgstr "Dalyvio adresas"
+
+#~ msgid "Attendees: "
+#~ msgstr "Dalyviai: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "At�aukti\n"
+#~ "susitikim�"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizatorius: "
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Skelbti\n"
+#~ "�vyk�"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Rodyti dialog�"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "�vykio pagrindai"
+
+#~ msgid "Settings..."
+#~ msgstr "Nuostatos..."
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Prad�ios data:"
+
+#~ msgid "Summary contains"
+#~ msgstr "Santraukoje yra"
+
+#~ msgid "Comment contains"
+#~ msgstr "Komentare yra"
+
+#~ msgid "Has category"
+#~ msgstr "Turi kategorij�"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Negal�jau patikrinti %s u�rakto bylos: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Skanuojamas IMAP aplankas"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Vidinis priedas"
+
+#~ msgid "Send as:"
+#~ msgstr "Si�sti kaip:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negal�jau atidaryti para�o bylos %s: \n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Tai n�ra paprasta byla."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Byla yra, bet jos ne�manoma perskaityti."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Ta byla atrod� pasiekiama, bet open(2) nepavyko."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Byla yra labai didel� (vir� 100K).\n"
+#~ "Ar tu tikrai nori j� �terpti?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negaliu atidaryti HTML bylos:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "Pasirink paslaug�"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Tu gali pasirinkti kit� HTML puslap� Executive Summary fonui.\n"
+#~ "\n"
+#~ "Tiesiog palik tu��i�, jei tenkina �prastinis fonas"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Atidaryti %s su �prasta GNOME programa"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Atidaryti %s su �prasta GNOME nar�ykle"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Si�sti lai�k� � %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Paleisti %s"
+
+#~ msgid "Close %s"
+#~ msgstr "U�daryti %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Perkelti %s kair�n"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Perkelti %s de�in�n"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Perkelti %s � praeit� eilut�"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Perkelti %s � kit� eilut�"
+
+#~ msgid "Appearance"
+#~ msgstr "I�vaizda"
+
+#~ msgid "Background:"
+#~ msgstr "Fonas:"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF ap�valgos gamykla."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ap�valga"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Testinio bonobo komponento gamykla."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Testinio komponento gamykla."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Testin� bonobo paslauga"
+
+#~ msgid "Test service"
+#~ msgstr "Testin� paslauga"
+
+#~ msgid "Update automatically"
+#~ msgstr "Atnaujinti automati�kai"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Persi�sti adresu"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Pakeisti aplanko �%s� format� � �%s�"
+
+#~ msgid "Closing current folder"
+#~ msgstr "U�daromas esamas aplankas"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Pervadinamas senas aplankas ir atidaromas"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopijuojami lai�kai"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution pa�anga"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Gaunamas lai�kas numeris %d i� %d (uid �%s�)"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "I�saugomas lai�kas %d i� %d (uid �%s�)"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Nepilnas lai�kas sura�ytas � pipe!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (persi�stas lai�kas)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (be temos)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Persi�stas lai�kas (be temos)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Spausdinti parinkt� lai�k�"
+
+#~ msgid "Delete this message"
+#~ msgstr "I�trinti �� lai�k�"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution bylos s�kmingai �diegtos."
+
+#~ msgid "Activate"
+#~ msgstr "Su�adinti"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Su�adinti �i� trump�"
+
+#~ msgid "Find a contact"
+#~ msgstr "Rasti kontakt�"
+
+#~ msgid "View All"
+#~ msgstr "Rodyti visus"
+
+#~ msgid "View all contacts"
+#~ msgstr "Rodyti visus kontaktus"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Dienos"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Sukurti nauj� kalendori�"
+
+#~ msgid "Day"
+#~ msgstr "Diena"
+
+#~ msgid "New _Event"
+#~ msgstr "Naujas �_vykis"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Atidaryti kalendori�"
+
+#~ msgid "Prev"
+#~ msgstr "Praeitas"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "I�saugoti kalendori� kaip ka�k� kit�"
+
+#~ msgid "Week"
+#~ msgstr "Savait�"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Atidaryti kalendori�"
+
+#~ msgid "About this application"
+#~ msgstr "Apie �i� program�"
+
+#~ msgid "About..."
+#~ msgstr "Apie..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Veiksm_ai"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Adres� knygel�... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "I�va_lyti"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Ti_krinti vardus (FIXME)"
+
+#~ msgid "Clear the selection"
+#~ msgstr "I�valyti pa�ym�jim�"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "_Kopijuoti � aplank�... (FIXME)"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "_Pirmas elementas aplanke (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "_Persi�sti (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Eiti � tolesn� element�"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Eiti � ankstesn� element�"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_Neu�baigta u�duotis (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "_Kitas"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Praeitas"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Spausdinimo _nuostatos..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "�ra�yti � dienotvark� ka�kok� susitikim�"
+
+#~ msgid "Select everything"
+#~ msgstr "Pa�ym�ti visk�"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "U�duoties p_ra�ymas (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Apie..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Elementas (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "�u_rnalo �ra�as (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "P_askutinis elementas aplanke (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Pa�to lai�kas (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Per_kelti � aplank�... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Pastaba (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Neskaitytas elementas (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Prid�ti paslaug�"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Prid�ti nauj� paslaug� � Executive Summary"
+
+#~ msgid "Create a new email"
+#~ msgstr "Sukurti nauj� lai�k�"
+
+#~ msgid "New Mail"
+#~ msgstr "Naujas lai�kas"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Pritaikyti visus naujus filtrus lai�kams �ioje d��ut�je"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Konfig�ruoti aplank�..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopijuoti lai�k� � nauj� aplank�"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Taisyti esam� lai�k�"
+
+#~ msgid "Expunge"
+#~ msgstr "I�valyti"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Visi�kai i�trinti visus lai�kus, pa�ym�tus i�trintais"
+
+#~ msgid "Forward inline"
+#~ msgstr "Persi�sti viduje"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr ""
+#~ "Persi�sti pa�ym�t� lai�k� viduje tavo lai�ko, taip kad tu j� gali pakeisti"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Pasl�pti i�trintus lai�kus"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Invertuoti �ym�jim�"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Pa�ym�ti skaitytu"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Pa�ym�ti _neskaitytu"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Perkelti lai�k� � nauj� aplank�"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Lai�ko spaudinio per�i�ra..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Spausdinti lai�k� spausdintuvu"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Nukreipti (FIXME)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Atsakyti visiems"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Atsakyti siunt�jui"
+
+#~ msgid "S_ource"
+#~ msgstr "�_altinis"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Si�sti atsakym� asmeniui, kuris tau atsiunt� �� lai�k�"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Si�sti vien� lai�k�, kaip atsakym� � visus pa�ym�tus lai�kus"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "I�si�sti laukiant� pa�t�\n"
+#~ "    ir parsi�sti nauj� pa�t�"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Rodyti neapdorot� lai�ko �altin�"
+
+#~ msgid "_Reply"
+#~ msgstr "_Atsakyti"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "I�_saugoti lai�k� kaip..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Gijomis"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "I�saugoti � _aplank�... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Si�sti lai�k� dabar"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "�terpt_i tekstin� byl�... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Priski_rti u�duot� (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Susitikimo _pra�ymas (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Pakartoti"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Pakartoti at�aukt� veiksm�"
+
+#~ msgid "Replace"
+#~ msgstr "Pakeisti"
+
+#~ msgid "Replace a string"
+#~ msgstr "Pakeisti eilut�"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Atsakyti _visiems (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Si�s_ti b�senos ataskait� (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Praleisti pasi_kartojim� (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "V�l ie�koti tos pa�ios eilut�s"
+
+#~ msgid "Search for a string"
+#~ msgstr "Ie�koti eilut�s"
+
+#~ msgid "Undo"
+#~ msgstr "At�aukti"
+
+#~ msgid "Undo the last action"
+#~ msgstr "At�aukti paskutin� veiksm�"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Pa�ym�ti u�baigta (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Atsakyti (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution juostos _trump�"
+
+#~ msgid "Advanced ..."
+#~ msgstr "I�sami..."
 
 #~ msgid "Body contains"
 #~ msgstr "Tekstas savyje turi"
@@ -8919,15 +12613,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "VFolder on Recipients"
 #~ msgstr "vAplankas pagal Gav�jus"
 
-#~ msgid "Save As..."
-#~ msgstr "I�saugoti kaip..."
-
 #~ msgid "Mark as Read"
 #~ msgstr "Pa�ym�ti skaitytu"
 
-#~ msgid "Mark as Unread"
-#~ msgstr "Pa�ym�ti neskaitytu"
-
 #~ msgid "Move to Folder..."
 #~ msgstr "Perkelti � aplank�..."
 
@@ -8943,9 +12631,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Click here to add a contact"
 #~ msgstr "Spausk �ia, kad prid�tum kontakt�"
 
-#~ msgid "Remove action"
-#~ msgstr "Pa�alinti veiksm�"
-
 #~ msgid "Remove criterion"
 #~ msgstr "Pa�alinti s�lyg�"
 
@@ -8959,9 +12644,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Keisti filtro taisykl�"
 
-#~ msgid "Source"
-#~ msgstr "�altinis"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Prid�ti vAplanko taisykl�"
 
@@ -8978,18 +12660,12 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Nenurodyta"
 
-#~ msgid "Check settings"
-#~ msgstr "Tikrinti nuostatas"
-
 #~ msgid "Email address:"
 #~ msgstr "El. pa�to adresas:"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Evolution pa�to nustatymas"
 
-#~ msgid "Hostname:"
-#~ msgstr "Hosto vardas:"
-
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
@@ -8999,18 +12675,12 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail"
-#~ msgstr "Pa�tas"
-
 #~ msgid "Mail Account"
 #~ msgstr "Pa�to s�skaita"
 
 #~ msgid "Mail Configuration Druid"
 #~ msgstr "Pa�to nustatymo meistras"
 
-#~ msgid "Optional"
-#~ msgstr "Neb�tinas"
-
 #~ msgid "Password:"
 #~ msgstr "Slapta�odis:"
 
@@ -9026,15 +12696,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Save password"
 #~ msgstr "I�saugoti slapta�od�"
 
-#~ msgid "Select signature file"
-#~ msgstr "Pasirink para�o byl�"
-
 #~ msgid "Server type:"
 #~ msgstr "Serverio tipas:"
 
-#~ msgid "Signature:"
-#~ msgstr "Para�as:"
-
 #~ msgid "Transport"
 #~ msgstr "Siuntimas"
 
@@ -9054,9 +12718,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "<ne�inomas>"
 
-#~ msgid "Message _Display"
-#~ msgstr "Lai�ko ro_dymas"
-
 #~ msgid "_Message Hiding"
 #~ msgstr "_Lai�k� sl�pimas"
 
@@ -9113,9 +12774,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ "�vyko klaida, bandant gauti pilot�\n"
 #~ "s�ra�� i� gnome-pilot demono"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "Konfig�ruoti adres� konduit�"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolution Adres� konduitas "
 
@@ -9155,9 +12813,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Account Properties"
 #~ msgstr "S�skaitos savyb�s"
 
-#~ msgid "E-Mail Address:"
-#~ msgstr "El. pa�to adresas:"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "�traukti � �Gauti pa�t� veiksmus."
 
@@ -9218,9 +12873,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_vAplankas pagal Tem�"
 
-#~ msgid "New"
-#~ msgstr "Nauja"
-
 #~ msgid "Customi_ze..."
 #~ msgstr "Prisi_taikyti..."
 
@@ -9229,6 +12881,3 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Rodyti _Trumpi� juost�"
-
-#~ msgid "_Settings"
-#~ msgstr "_Nuostatos"
diff --git a/po/nl.po b/po/nl.po
index a686c8d268..5f7f820eed 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-06-20 11:04+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-06-18 22:09+GMT\n"
 "Last-Translator: Mendel Mobach <mendel@mobach.nl>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -17,11 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3324
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabriek om GnomeCard bestanden importeren in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importeert GnomeCard bestanden naar Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kaart: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -29,7 +37,7 @@ msgstr ""
 "\n"
 "Naam: "
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -37,7 +45,7 @@ msgstr ""
 "\n"
 "  Voorvoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 "  Gegeven:      "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -53,7 +61,7 @@ msgstr ""
 "\n"
 "  Extra: "
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -61,7 +69,7 @@ msgstr ""
 "\n"
 "  Familie:      "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -69,7 +77,7 @@ msgstr ""
 "\n"
 "  Achtervoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -77,7 +85,7 @@ msgstr ""
 "\n"
 "Geboortedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -85,7 +93,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -93,7 +101,7 @@ msgstr ""
 "\n"
 "  Postbus:  "
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -101,7 +109,7 @@ msgstr ""
 "\n"
 "  Ext:           "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -109,7 +117,7 @@ msgstr ""
 "\n"
 "  Straat:      "
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -117,7 +125,7 @@ msgstr ""
 "\n"
 "  Plaats:        "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -125,7 +133,7 @@ msgstr ""
 "\n"
 "  Regio:      "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -133,7 +141,7 @@ msgstr ""
 "\n"
 "  Postcode: "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -141,7 +149,7 @@ msgstr ""
 "\n"
 "  Land:      "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -149,7 +157,7 @@ msgstr ""
 "\n"
 "Afleveringslabel: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -157,7 +165,7 @@ msgstr ""
 "\n"
 "Telefoons:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -165,7 +173,7 @@ msgstr ""
 "\n"
 "Telefoon:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -173,7 +181,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -181,7 +189,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -189,7 +197,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -197,7 +205,7 @@ msgstr ""
 "\n"
 "Tijdzone: "
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -205,7 +213,7 @@ msgstr ""
 "\n"
 "Geografische Locatie: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -213,7 +221,7 @@ msgstr ""
 "\n"
 "Bedrijfsrol: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -221,7 +229,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -229,7 +237,7 @@ msgstr ""
 "\n"
 "  Naam:   "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -237,7 +245,7 @@ msgstr ""
 "\n"
 "  Eenheid:  "
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -245,7 +253,7 @@ msgstr ""
 "\n"
 "  Eenheid2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -253,7 +261,7 @@ msgstr ""
 "\n"
 "  Eenheid3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -261,7 +269,7 @@ msgstr ""
 "\n"
 "  Eenheid4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -269,7 +277,7 @@ msgstr ""
 "\n"
 "Categorie�n: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -287,7 +295,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -295,7 +303,7 @@ msgstr ""
 "\n"
 "Unieke Tekenreeks: "
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -303,36 +311,24 @@ msgstr ""
 "\n"
 "Publieke Sleutel: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
 
-#: addressbook/backend/ebook/e-destination.c:244
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabriek om GnomeCard bestanden importeren in Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importeert GnomeCard bestanden naar Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -345,14 +341,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
@@ -361,725 +357,813 @@ msgstr "Kon \"wombat\" niet starten"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Een Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Een Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control dat een Evolution minikaart adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Adresboek minikaartbekijker"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Een component voor het afhandelen van contacten."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fabriek voor het Adresboek Minikaart control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fabriek voor het Evolution adresboek component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Bestand"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Onbekend adresboek type"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Geen (anonieme modus)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Onbekende aanmeldingstype"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Basis"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Een"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Subboom"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Onbekend bereiktype"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Bind DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Verbindings DN Help tekst hier"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Onthoud dit wachtwoord"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Computernaam:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Computernaam help tekst hier."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Stam DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Stam DN help tekst hier."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Poort:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Poort help tekst hier."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Zoekbereik:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Aanmelding:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Geavanceerd LDAP opties"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Pad:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Pad Help tekst hier"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Maak pad als het niet bestaat."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Bewerk Adresboek"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Adresboek Toevoegen"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Selecteer het soort adresboek dat u hebt en voer de relevante informatie "
+"erover in."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Naam:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Naam help tekst hier"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Omschrijving:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME Beschrijving help tekst hier"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Toevoegen"
+msgid "Addressbook Sources"
+msgstr "Adresboekbronnen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Naam"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "B_ewerken..."
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Andere Contacten"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Voer het wachtwoord voor %s in"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kan het adresboek niet openen"
+
+#: addressbook/gui/component/addressbook.c:380
+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 ""
+"Kan het adresboek niet openen.  Dit kan komen doordat\n"
+"u een ongeldige URI heeft opgegeven of de LDAPserver\n"
+"down is."
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Deze versie van Evolution heeft geen LDAP support\n"
+"u moet het mee compileren.  Als u LDAP wilt gebruiken in Evolution\n"
+"moet u het programma vanuit de CVS sources meecompileren\n"
+"nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
+"en of u het mag benaderen."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Elk veld bevat"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Naam bevat"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-mail bevat"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Naam bevat"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "De URI die de Mapbladeraar zal laten zien"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Primaire E-mail"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Selecteer een bestand"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Nieuw contact maken"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Bewerk Adresboek"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Bewerk Contactinformatie"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Toevoegen aan contacten"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "E-mailadres:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Zet queries uit"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Queries toestaan (Gevaarlijk!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "De adresboeknaam-selectie-interface van Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Factory voor de naamselectie-interface van het Adresboek"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Alle Verwijderen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTLM email versturen?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Andere Contacten"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Geaddresseerden"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Selecteer namen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Selecteer naam van:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categorie:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Zoeken"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Verjaardag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Bedrijf"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Bedrijfs_fax"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacten..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie�n..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Contacten Bewerken"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:123
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Opslaan Als:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Algemeen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nieuw telefoontype"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Aa_ntekeningen:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisatie:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefoontypes"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1431
-msgid "Primary Email"
-msgstr "Primaire E-mail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Bij voorkeur _HTML-berichten"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Homepage:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
-msgid "_Add"
-msgstr "_Toevoegen"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Assistent:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Ge_boortedatum:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Werk"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Bedrijf:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "C_ontacten..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:911 mail/mail-config.glade.h:95
-#: ui/evolution-mail.xml.h:110 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "Af_deling:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Volledige Naam..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "Priv�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Functie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Manager:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobiele Telefoon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Bijnaam:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Kant_oor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Beroep:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Echtgeno(o)t(e):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Dit is een email-adres"
 
-#: addressbook/contact-editor/e-contact-editor.c:657
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Contact verwijderen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot deze categori�en:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1389
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1390
-#: addressbook/contact-editor/e-contact-editor.c:1457
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Zakelijk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1391
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1392
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1393
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Terugbel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1394
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1395
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Bedrijf"
 
-#: addressbook/contact-editor/e-contact-editor.c:1396
-#: addressbook/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Thuis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1397
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Thuis 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1398
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1399
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1400
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1401
-#: addressbook/contact-editor/e-contact-editor.c:1459
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Overige"
 
-#: addressbook/contact-editor/e-contact-editor.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Andere Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1403
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pieper"
 
-#: addressbook/contact-editor/e-contact-editor.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Eerste"
 
-#: addressbook/contact-editor/e-contact-editor.c:1405
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1406
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1407
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1432
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1433
-#: addressbook/gui/widgets/e-addressbook-view.c:725
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Contact verwijderen?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Volledig bewerken"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Volledige Naam:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Controleer Adres"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Verenigde Staten"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Plaats:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Controleer Volledige Naam"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Dhr."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Mjfr."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Dhr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mevr."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Mevr."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Dhr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Voornaam:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Achternaam:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Tweede Naa_m:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:341
-#, c-format
-msgid "Enter password for %s"
-msgstr "Voer het wachtwoord voor %s in"
-
-#: addressbook/gui/component/addressbook.c:369
-msgid "Unable to open addressbook"
-msgstr "Kan het adresboek niet openen"
-
-#: addressbook/gui/component/addressbook.c:376
-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 ""
-"Kan het adresboek niet openen.  Dit kan komen doordat\n"
-"u een ongeldige URI heeft opgegeven of de LDAPserver\n"
-"down is."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Bestandsnaam:"
 
-#: addressbook/gui/component/addressbook.c:381
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Deze versie van Evolution heeft geen LDAP support\n"
-"u moet het mee compileren.  Als u LDAP wilt gebruiken in Evolution\n"
-"moet u het programma vanuit de CVS sources meecompileren\n"
-"nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "December"
 
-#: addressbook/gui/component/addressbook.c:389
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: 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 ""
-"Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
-"en of u het mag benaderen."
-
-#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:214
-msgid "Any field contains"
-msgstr "Elk veld bevat"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "Name contains"
-msgstr "Naam bevat"
-
-#: addressbook/gui/component/addressbook.c:551
-msgid "Email contains"
-msgstr "E-mail bevat"
-
-#: addressbook/gui/component/addressbook.c:697
-msgid "The URI that the Folder Browser will display"
-msgstr "De URI die de Mapbladeraar zal laten zien"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Bestand"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Onbekend adresboek type"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Geen (anonieme modus)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Onbekende aanmeldingstype"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Een"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Subboom"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Onbekend bereiktype"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Verbindings DN Help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:68
-msgid "Remember this password"
-msgstr "Onthoud dit wachtwoord"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
-msgid "Host:"
-msgstr "Computernaam:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Computernaam help tekst hier."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Stam DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Stam DN help tekst hier."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Poort:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Poort help tekst hier."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Zoekbereik:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Aanmelding:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Geavanceerd LDAP opties"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
-msgid "Path:"
-msgstr "Pad:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pad Help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Maak pad als het niet bestaat."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Bewerk Adresboek"
 
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Adresboek Toevoegen"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"Selecteer het soort adresboek dat u hebt en voer de relevante informatie "
-"erover in."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
-msgid "Name:"
-msgstr "Naam:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Naam help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Beschrijving help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adresboekbronnen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-mail.xml.h:23 ui/evolution-tasks.xml.h:3
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Bewerken"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Naam"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Andere Contacten"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Zet queries uit"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Queries toestaan (Gevaarlijk!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "Bewerk Contactinformatie"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "Toevoegen aan contacten"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Een Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Een Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control dat een Evolution minikaart adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adresboek minikaartbekijker"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Een component voor het afhandelen van contacten."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabriek voor het Adresboek Minikaart control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabriek voor de naam selectie interface van het Adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabriek voor het Evolution adresboek component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "Verwijderen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Alle Verwijderen"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "HTLM email versturen?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "De adresboeknaam-selectie-interface van Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory voor de naamselectie-interface van het Adresboek"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Zoek..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Geaddresseerden"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecteer namen"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Contacten Bewerken"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selecteer naam van:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Contacten Bewerken"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1100,26 +1184,27 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr ""
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 #, fuzzy
 msgid "Changed Contact:"
 msgstr "Andere Contacten"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Andere Contacten"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1233,171 +1318,249 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Stuur contact naar ander..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Stuur bericht aan contact..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:71 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Afdrukken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Envelop Afdrukken..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Bronnen"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Werk zonder netwerk"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Operatie niet toegestaan"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Bestand niet gevonden"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operatie niet ondersteund"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Geannuleerd"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O fout"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr ""
+"Fout bij lezen gegevens:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Fout bij lezen gegevens:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Klik hier om een contact toe te voegen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Opslaan Als:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Eerste Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Assistent Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "TerugbelTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "BedrijfsTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Thuis Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Bedrijfs Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Huis Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Autotelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Bedrijf Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Thuis Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Andere Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Ander Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Afdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Kantoor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Functie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Beroep"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Echtgenoot/Echtgenote"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Vrij/Bezet URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #, fuzzy
 msgid "Done."
 msgstr "Klaar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Error removing card"
-msgstr ""
-"Fout bij lezen gegevens:\n"
-"%s"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 #, fuzzy
 msgid "Removing cards..."
 msgstr "verwijderen map %s"
 
-#: addressbook/gui/widgets/e-minicard.c:436
-#, fuzzy
-msgid "Error modifying card"
-msgstr "Fout bij laden %s"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Opslaan in het adresboek"
@@ -1445,7 +1608,8 @@ msgid "Dimensions:"
 msgstr "Afmetingen:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Lettertype..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1585,40 +1749,61 @@ msgid "Width:"
 msgstr "Breedte:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Lettertype..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalenderserver"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon Kalendergegevens niet uit de pilot lezen"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Herinnering van uw afspraak op "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Een voorbeeld Bonobo-control dat een kalender toont."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sluimeren"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution kalender-samenvatting-component"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalender iTip/iMip bekijker"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution component voor het afhandelen van de kalender."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Fabriek voor het Kalender Samenvattings component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Fabriek voor het Evolution kalender component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Fabriek voor het kalender iTip bekijk control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fabriek voor het voorbeeld Kalender control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabriek voor het Evolution kalender component."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1628,7 +1813,92 @@ msgstr "Alarmnotificatie-dienst"
 msgid "Factory for the alarm notification service"
 msgstr "Factory voor de Alarmnotificatie-dienst."
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Toon informatie over Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Sluiten"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Sluimeren"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Sluimertijd (minuten)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Afspraak bewerken"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Geen samenvatting beschikbaar."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Herinnering van uw afspraak op "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Sluimeren"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
@@ -1637,133 +1907,162 @@ msgstr ""
 "Het is %s.  De Unix tijd is %ld nu.  We dachten dat u het wel zou willen "
 "weten."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Kon GNOME niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Kon Bonobo niet initialiseren"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Cre�eren van de alarmnotificatie-dienst is mislukt:"
 
-#: calendar/gui/calendar-commands.c:274
-msgid "File not found"
-msgstr "Bestand niet gevonden"
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:298
-msgid "Open calendar"
-msgstr "Open kalender"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:340
-msgid "Save calendar"
-msgstr "Kalender opslaan"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Openbaar"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Hoog"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normaal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Laag"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Ondoorzichtig"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Niet Gestart"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "In Uitvoer"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Voltooid"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1774,24 +2073,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "De classificering moet 'Openbaar', 'Priv�', 'Vertrouwelijk', of 'Geen' zijn"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
-#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:1005
-#: mail/mail-accounts.c:125 mail/mail-accounts.c:176
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1394
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1801,187 +2104,263 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "De prioriteit moet 'Hoog', 'Normaal', 'Laag' of 'Ongedefinieerd' zijn"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "De doorzichtigheid moet 'Doorzichtig', 'Ondoorzichtig' of 'Geen' zijn."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nee"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Kaartweergave"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Werkweek"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Defineer Bekijkmogelijkheid"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Maand"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm op %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Geluidsalarmen"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Geaddresseerden"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Geen samenvatting beschikbaar."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Weergave-instellingen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-message-composer.xml.h:3
-#: ui/evolution-subscribe.xml.h:2 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Sluiten"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Afspraak bewerken"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Sluimertijd (minuten)"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Berichten"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Speel een geluid af"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Start een programma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dagen"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualiseer elke "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "uren"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuten"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d dagen"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 #, fuzzy
 msgid "1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d weken"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 #, fuzzy
 msgid "1 week"
 msgstr " 1 week"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d uren"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 uur"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuut"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d seconden"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 #, fuzzy
 msgid "1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "Toon een dialoogvenster"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Laat volgende bericht zien"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Verstuur een e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " voor het begin van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " na het begin van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " voor het eind van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " na het eind van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
 msgid "Basics"
 msgstr "Basis"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Datum & Tijd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Instellingen..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opties"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2004,15 +2383,11 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:18 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minu(u)t(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:19
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
@@ -2045,29 +2420,29 @@ msgid "60 minutes"
 msgstr "60 minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarm stopt na"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Geluidsalarmen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Piep als het alarm venster verschijnt."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Kalender Instellingen"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Kleuren"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
@@ -2075,7 +2450,8 @@ msgid "Compress weekends in month view"
 msgstr "Weekeinden comprimeren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Datumnavigator instellingen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2083,192 +2459,282 @@ msgid "Defaults"
 msgstr "Standaardinstellingen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Weergave-instellingen"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Weergave"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:155
-msgid "Due Date"
-msgstr "Verloop Datum"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Maak sluimeren mogelijk voor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Eind van dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Eerste dag van de week:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Vrij"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Highlight"
-msgstr "Markeer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today"
-msgstr "Items die vandaag verlopen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Due Today:"
-msgstr "Items die vandaag verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due"
-msgstr "Items die nog niet zijn verlopen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Items Not Yet Due:"
-msgstr "Items die nog niet zijn verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Maa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items"
-msgstr "Verlopen items"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Overdue Items:"
-msgstr "Verlopen items:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "Kies een kleur"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/e-calendar-table.c:158
-msgid "Priority"
-msgstr "Prioriteit"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Verlopen items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Herinner me aan alle afspraken"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Zat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show"
-msgstr "Weergeven"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "Toon afspraak-eindtijden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Toon weeknummers"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Begin van dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Zon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Zondag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "TaskPad"
-msgstr "TaakBlad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Taken"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Items die vandaag verlopen"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Don"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Time"
 msgstr "Functie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time Until Due"
-msgstr "Tijd Tot Verlooptijd"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Tijddelingen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "Time zone:"
 msgstr ""
 "\n"
 "Tijdzone: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Din"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Visual Alarms"
-msgstr "Visuele Alarmen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Woe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Werkweek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuten voordat ze plaatsvinden."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr "seconden."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Weet u zeker dat u deze account wilt verwijderen?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Weet u zeker dat u de %d taken wilt verwijderen?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Weet u zeker dat u dagboek entry `%s' wilt verwijderen?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Verloop Datum"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Afspraak Bewerken"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Afspraak - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Taak - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Dagboekelement - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Geen samenvatting"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Bestand overschrijven?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Er bestaat al een bestand met die naam.\n"
+"Overschrijven?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Opslaan Als..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
@@ -2312,20 +2778,44 @@ msgstr "Weet u zeker dat u de %d taken wilt verwijderen?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selecteer een bestand"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Secties:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Tijdzone: "
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 #, fuzzy
 msgid "Meeting"
 msgstr "Afspraak annuleren"
@@ -2336,7 +2826,7 @@ msgstr "_Gebeurtenis die de gehele dag plaatsvindt"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificatie"
 
@@ -2365,11 +2855,6 @@ msgstr "Sa_menvatting:"
 msgid "_Confidential"
 msgstr "_Vertrouwelijk"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "C_ontacten..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "_Eindtijd:"
@@ -2378,38 +2863,271 @@ msgstr "_Eindtijd:"
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Groep:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Papierbron:"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Voorzitter"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Vereiste Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Optionele Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Niet-Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Actie Toevoegen"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Accepteer "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Weiger "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Voorlopig"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "In Uitvoer"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autotelefoon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Vereiste Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Optionele Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Niet-Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Verzonden"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Verwijderen..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Aanwezige"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Voltooiingsdatum"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Manager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "December"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rol"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 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 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Coordinator"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Coordinator"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Nod_ig anderen uit..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Coordinator"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "op"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "op de"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "e"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "gebeurtenissen"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Aangepaste herhaling"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Elke"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Aanpassen"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Geen herhaling"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Herhalingsregel"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Eenvoudige herhaling"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Aanpassen"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "voor"
@@ -2419,67 +3137,62 @@ msgid "forever"
 msgstr "eeuwig"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "maand(en)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "tot"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "we(e)k(en)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "ja(a)r(en)"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
-#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
-
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
-msgstr "op"
-
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
-msgstr "op de"
-
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
-msgstr "e"
-
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "gebeurtenissen"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Voltooiingsdatum:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Verwijderd"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Geen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:118
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "_Taak"
 
@@ -2508,283 +3221,323 @@ msgstr "_Prioriteit:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:150
-msgid "Categories"
-msgstr "Categorie�n"
-
-#: calendar/gui/e-calendar-table.c:152
-msgid "Completion Date"
-msgstr "Voltooiingsdatum"
-
-#: calendar/gui/e-calendar-table.c:153
-msgid "End Date"
-msgstr "Einddatum"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Start Date"
-msgstr "Begindatum"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Geographical Position"
-msgstr "Geografische Positie"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "Percent complete"
-msgstr "Percentage voltooid"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Transparency"
-msgstr "Transparantie"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Alarms"
-msgstr "Alarmen"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Click here to add a task"
-msgstr "Klik hier om een taak toe te voegen"
-
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:737
-msgid "Edit this task"
-msgstr "Bewerk deze taak"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Openen"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "K_nippen"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopi�ren"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:739
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Markeer de taak als voltooid"
 
-#: calendar/gui/e-calendar-table.c:740
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Verwijder deze taak"
 
-#: calendar/gui/e-calendar-table.c:745
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Markeer de taak als voltooid"
 
-#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Verwijder de geselecteerde taken"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:306
-#: calendar/gui/print.c:782
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Klik hier om een taak toe te voegen"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:309
-#: calendar/gui/print.c:784
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Vo_ltooid:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmen"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorie�n"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Voltooid"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Voltooiingsdatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Verloop Datum"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Einddatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografische Positie"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Begindatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Taken"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparantie"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuten delingen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1325
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1339
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1352
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3179 calendar/gui/e-day-view.c:3208
-#: calendar/gui/e-week-view.c:3017 calendar/gui/e-week-view.c:3045
-#: ui/evolution-addressbook.xml.h:10
-msgid "Paste"
-msgstr "Plakken"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-day-view.c:3184 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/e-day-view.c:3186 calendar/gui/e-week-view.c:3024
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Gebeurtenis die de gehele dag plaatsvindt"
 
-#: calendar/gui/e-day-view.c:3191 calendar/gui/e-week-view.c:3029
-msgid "Go to Today"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr "Ga Naar Vandaag"
 
-#: calendar/gui/e-day-view.c:3193 calendar/gui/e-week-view.c:3031
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ga Naar Datum"
 
-#: calendar/gui/e-day-view.c:3200 calendar/gui/e-week-view.c:3037
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Openen"
-
-#: calendar/gui/e-day-view.c:3202 calendar/gui/e-week-view.c:3039
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Verwijder deze afspraak"
 
-#: calendar/gui/e-day-view.c:3204 calendar/gui/e-week-view.c:3041
-#: ui/evolution-addressbook.xml.h:5
-msgid "Cut"
-msgstr "Knippen"
-
-#: calendar/gui/e-day-view.c:3206 calendar/gui/e-week-view.c:3043
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail.xml.h:9
-msgid "Copy"
-msgstr "Kopi�ren"
-
-#: calendar/gui/e-day-view.c:3217 calendar/gui/e-week-view.c:3059
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-day-view.c:3219 calendar/gui/e-week-view.c:3061
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-day-view.c:3221
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuten delingen"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:165
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kon uw kalender bestand niet updaten!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "Dit is een email-adres"
 
-#: calendar/gui/e-itip-control.c:171 calendar/gui/e-itip-control.c:377
-msgid "Component successfully updated."
-msgstr "Component successvol geactualiseerd."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:177
-msgid "There was an error loading the calendar file."
-msgstr "Er is een fout opgetreden tijdens het laden van het kalender bestand."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:201
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kon uw kalender bestand niet openen!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:325 calendar/gui/e-itip-control.c:396
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kon uw kalender bestand niet laden!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:337
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kon uw kalender bestand niet lezen!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Dit bericht is nu niet beschikbaar"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:350
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dit is een antwoord van iemand die niet was uitgenodigd!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:366
-msgid "I couldn't update your calendar store."
-msgstr "Kon uw kalenderopslag niet actualiseren."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:407
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Ik kon het kalender component niet verwijderen!\n"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:417
-msgid "Component successfully deleted."
-msgstr "Component successvol verwijderd."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:566
-msgid "I don't recognize this type of calendar component."
-msgstr "Type kalendercomponent niet herkend."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:640
-msgid "Add to Calendar"
-msgstr "Toevoegen aan Kalender"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
-msgid " Accept "
-msgstr " Accepteer "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:675
-msgid " Decline "
-msgstr " Weiger "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
-#: calendar/gui/e-itip-control.c:676
-msgid " Tentative "
-msgstr " Voorlopig"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
-msgid "Update Calendar"
-msgstr "Kalender actualiseren"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
-msgid "Cancel Meeting"
-msgstr "Afspraak annuleren"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Kon uw kalender bestand niet updaten!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Kon uw kalender bestand niet openen!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2811,10 +3564,6 @@ msgstr "Bezig met laden Kalender"
 msgid "Loading calendar..."
 msgstr "Bezig met laden kalender..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Coordinator"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server Bericht:"
@@ -2827,98 +3576,48 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:529
-#: calendar/gui/e-tasks.c:562
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Allen"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categorie:"
 
-#: calendar/gui/e-tasks.c:337
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-week-view.c:3022 calendar/gui/e-week-view.c:3050
-msgid "New Appointment..."
-msgstr "Nieuwe Afspraak..."
-
-#: calendar/gui/e-week-view.c:3063
-msgid "Delete All Occurrences"
-msgstr "Verwijder alle Gebeurtenissen"
-
 #. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1583
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:215
-msgid "Summary contains"
-msgstr "Bondige inhoud bevat"
-
-#: calendar/gui/gnome-cal.c:216
-msgid "Description contains"
-msgstr "Omschrijving bevat:"
-
-#: calendar/gui/gnome-cal.c:217
-msgid "Comment contains"
-msgstr "Commentaar bevat"
-
-#: calendar/gui/gnome-cal.c:218
-msgid "Has category"
-msgstr "Heeft Categorie:"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nieuwe Afspraak..."
 
-#: calendar/gui/gnome-cal.c:1020
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1031
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Een voorbeeld Bonobo-control dat een kalender toont."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender-samenvatting-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip bekijker"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution component voor het afhandelen van de kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabriek voor het Kalender Samenvattings component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabriek voor het Evolution kalender component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fabriek voor het kalender iTip bekijk control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabriek voor het voorbeeld Kalender control"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -2940,235 +3639,257 @@ msgid "Go To Date"
 msgstr "Ga Naar Datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ga Naar Vandaag"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januari"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Maart"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mei"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ga Naar Vandaag"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24ste"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30e"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31e"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Zo"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Wo"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Vr"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Za"
 
-#: calendar/gui/print.c:1844 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Taken"
 
 #. Day
-#: calendar/gui/print.c:1951
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Dag van vandaag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1971
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1982
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Huidige week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1990
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Huidige maand (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1997
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Huidig jaar (%Y)"
 
-#: calendar/gui/print.c:2212
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
-#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1543
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: calendar/gui/tasks-control.c:112
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Item afdrukken"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "Printerinstellingen"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
@@ -3214,98 +3935,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now verwacht 0 argumenten"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time verwacht 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time verwacht dat argument 1 een string is"
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "make-time argument 1 moet een ISO-8601 date/time string zijn"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day verwacht 2 argumenten"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day verwacht dat argument 2 een integer is"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin verwacht 1 argument"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-bewgin verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-dat-end verwacht 1 argument"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-dat-end verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype verwacht geen argumenten"
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? verwacht 2 argumenten"
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? verwacht dat argument 2 een time_t is"
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr "Bevat? verwacht 2 argumenten"
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? verwacht dat argument 1 een string is"
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? verwacht dat argument 2 een string is"
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-"contains? verwacht dat argument 1 een kleuze is uit "
-"\"any\",\"summary\",\"description\""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? verwacht op zijn minst 1 argument"
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? verwacht dat alle argumenten strings zijn"
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Evaluation of the search expression did not yield a boolean value"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
@@ -3326,64 +3955,80 @@ msgstr "Het gespecificeerde type word niet ondersteund door deze steutel"
 msgid "Decryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
-msgid "Complete"
-msgstr "Voltooid"
-
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde op bericht %d van %d"
 
-#: camel/camel-filter-driver.c:883
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:888
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -3419,6 +4064,26 @@ msgstr "Bezig met uitvoeren van zoekopdracht op onbekende kop: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kon de pijp niet maken: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan map niet verkrijgen: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Kon niet starten: %s"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3442,108 +4107,108 @@ msgstr "Verkrijgen van vergrendeling met fcntl(2) mislukt: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Verkrijgen van vergrendeling met flock(2) mislukt: %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kon postbusbestand %s niet controleren: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kon postbusbestand %s niet openen: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kon tijdelijk postbusbestand %s niet openen: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fout bij het lezen van postbusbestand: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kon de pijp niet maken: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kon niet starten: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programma mislukt: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Onbekende fout)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Fout bij het lezen van postbusbestand: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Voer uw %s passphrase voor %s in"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Voer uw %s passphrase in."
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "geen plaintext om te signeren"
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kon de pijp naar GPG/PGP niet maken: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "geen plaintext voor clearsing"
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "geen plaintext om te controleren"
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kon tijdelijk bestand niet maken: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Geen plaintext om te encrypten"
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Geen ontvangers gespecifieerd"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "geen ciphertext om te decoderen."
 
@@ -3577,7 +4242,7 @@ msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
@@ -3586,13 +4251,13 @@ msgstr "Kon niet verbinden met %s (poort %d): %s"
 msgid "(unknown host)"
 msgstr "(onbekende machine)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server verbrak onverwacht de verbinding"
 
@@ -3703,7 +4368,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -3774,7 +4439,7 @@ msgstr "Voor het lezen van post als een zoekopdracht op een verzameling mappen"
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3821,33 +4486,17 @@ msgstr "Faalde bij bericht %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1020 mail/mail-ops.c:1027
-#: mail/mail-ops.c:1045 mail/mail-ops.c:1046
-msgid "Trash"
-msgstr "Prullenbak"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"EMail: %s\n"
-"Gebruiksnaam: %s\n"
-"Organizatie Unit: %s\n"
-"Organizatie: %s\n"
-"Plaats: %s\n"
-"Staat: %s\n"
-"Land: %s"
+"Issuer: %s\n"
+"Onderwerp: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3862,26 +4511,36 @@ msgstr ""
 "\n"
 "Wil je het alsnog accepteren?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Issuer: %s\n"
-"Onderwerp: %s"
+"EMail: %s\n"
+"Gebruiksnaam: %s\n"
+"Organizatie Unit: %s\n"
+"Organizatie: %s\n"
+"Plaats: %s\n"
+"Staat: %s\n"
+"Land: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Een dergelijk bericht bestaat niet: %s"
@@ -3890,68 +4549,75 @@ msgstr "Een dergelijk bericht bestaat niet: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "U kunt geen berichten kopieeren vanuit deze vuilnisbak"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kon cache map %s niet openen"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-commando mislukt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Onbekende fout"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP-server gaf onverwacht een 'OK' antwoord: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:415
-msgid "Scanning IMAP folder"
-msgstr "Bezig met scannen IMAP-map"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Bezig met het opslaan van berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Bezig met het opslaan van berichten"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Kon cache map %s niet openen"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Controleren voor nieuwe email"
 
@@ -3959,7 +4625,7 @@ msgstr "Controleren voor nieuwe email"
 msgid "Check for new messages in all folders"
 msgstr "Controleer op nieuwe mail in alle mappen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mappen"
 
@@ -3993,28 +4659,28 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:465
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/imap/camel-imap-store.c:475
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:499
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:514
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:540
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4025,11 +4691,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH-formaat postbussen"
@@ -4065,6 +4735,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "Voor het opslaan van lokale post in qmail-maildir-postbussen"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Opslaglocatie %s is geen absoluut pad"
@@ -4104,7 +4775,8 @@ msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kon indexbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
@@ -4120,6 +4792,7 @@ msgstr "Kan bericht niet toevoegen aan maildir-map: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4131,6 +4804,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
@@ -4139,7 +4813,7 @@ msgstr "Een dergelijk bericht bestaat niet"
 msgid "Invalid message contents"
 msgstr "Ongeldige berichtinhoud"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4149,14 +4823,14 @@ msgstr ""
 "Kon map `%s' niet openen:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4166,23 +4840,23 @@ msgstr ""
 "Kon map `%s' niet maken:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' is geen maildir-directory."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kon map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -4196,11 +4870,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kon maildir directory path niet openen: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postbus niet openen: %s: %s\n"
@@ -4213,6 +4889,9 @@ msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4222,10 +4901,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
@@ -4271,36 +4952,45 @@ msgstr "Map `%s' is niet leeg. Niet verwijderd."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Bezig met samenvatten map"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale e-mail-interpreatiefout op positie %ld in map %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kon map niet samenvatten: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1601
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Bezig met synchroniseren map"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijke postbus niet openen: %s"
@@ -4309,21 +4999,28 @@ msgstr "Kon tijdelijke postbus niet openen: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijke postbus: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bronmap %s niet sluiten: %s"
@@ -4338,7 +5035,9 @@ msgstr "Kon de tijdelijke map niet sluiten: %s"
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
@@ -4358,39 +5057,95 @@ msgstr "`%s' is geen directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kon MH-postbus map niet openen: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' is geen normaal bestand."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Map `%s' bestaat niet."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Lokale opslaglocaties hebben geen postbus-in"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Lokaal postbusbestand %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Kon tijdelijk postbusbestand %s niet openen: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+"Kon map `%s' niet maken:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Voer het NNTP-wachtwoord voor %s@%s in"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "De server weigerde de gebruikersnaam"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Versturen van de gebruikersnaam naar de server mislukt"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "De server weigerde de gebruikernaam en/of het wachtwoord"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Bericht %s kon niet worden gevonden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Kon groepenlijst niet van server ophalen."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Fout bij het laden van het groepenlijstbestand voor %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Fout bij het opslaan van het groepenlijstbestand voor %s: %s"
@@ -4405,25 +5160,25 @@ msgstr ""
 "Dit is een provider voor het lezen van en versturen naar USENET "
 "nieuwsgroepen."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kon directory voor nieuwsservers niet openen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Deze optie zal aanmelden bij de NNTP-server met een wachtwoord platte tekst."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc-bestand kon niet geopend of gemaakt worden voor %s: %s"
@@ -4474,7 +5229,7 @@ msgstr "Laat de berichten op de server achter"
 msgid "Delete after %s day(s)"
 msgstr "Verwijder na %s dag(en)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4569,7 +5324,7 @@ msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4623,7 +5378,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4633,122 +5388,122 @@ msgstr ""
 "Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
 "afstand, gebruik makend van SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Syntactische fout, commando niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntactische fout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Commando niet ge�mplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Commando-parameter niet ge�mplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Systeem-status, of systeem-help-antwoord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Helpbericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Dienst is gereed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Postopdracht geslaagd, voltooid"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Postopdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Opdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Opdracht niet uitgevoerd: onvoldoende ruimte op systeem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Postopdracht afgebroken: gebruikt teveel ruimte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Opdracht niet uitgevoerd: postbusnaam niet toegestaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start postinvoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Veranderen van wachtwoord is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Aanmeldingsmechanisme te zwak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Versleuteling vereist voor gewenst aanmeldingsmechanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Tijdelijke aanmeldingsfout"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "'Welkom respons'-fout: %s: waarschijnlijk niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVoer het SMTP wachtwoord in voor %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4759,115 +5514,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan bericht niet versturen: afzender niet gedefini�erd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Bezig met versturen bericht"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Afspraak annuleren"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "'HELO respons'- fout: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Aanmelding"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'MAIL FROM'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fout bij 'MAIL FROM'-respons: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fout bij 'RCPT TO'-respons: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fout bij DATA-respons: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fout bij DATA-respons: bericht afgebroken: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fout bij RSET-respons: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Time-out tijdens QUIT-verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fout bij QUIT-respons: %s: niet-fataal"
@@ -4897,7 +5666,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:124
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "bijlage"
 
@@ -4926,33 +5695,108 @@ msgid "MIME type:"
 msgstr "MIME type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:633
-#, c-format
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Klik hier voor het adresboek"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "Van:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Antwoordadres:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "Aan:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "Geef de geadresseerden"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
+"op de geadresseerden-lijst van het bericht verschijnen."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Voeg een bestand toe als bijlage"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Kon handtekeningsbestand %s niet openen:\n"
+"Kon bestand `%s' niet openen:\n"
 "%s"
 
-#: composer/e-msg-composer.c:806
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Fout bij openen bestand: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: composer/e-msg-composer.c:817
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Waarschuwing"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4960,12 +5804,53 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: composer/e-msg-composer.c:971 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:228
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Fout bij opslaan bestand: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Kon bericht niet van POP server %s halen: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Fout bij opslaan berichten in: %s:\n"
+" %s"
 
-#: composer/e-msg-composer.c:977
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution heeft Pine mailbestanden gevonden.\n"
+"Wilt u deze importeren naar Evolution?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4975,102 +5860,31 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1002
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1158
-msgid "That file does not exist."
-msgstr "Het bestand bestaat niet."
-
-#: composer/e-msg-composer.c:1168
-msgid "That is not a regular file."
-msgstr "Het is geen gewoon bestand."
-
-#: composer/e-msg-composer.c:1178
-msgid "That file exists but is not readable."
-msgstr "Het bestand bestaat maar is niet leesbaar."
-
-#: composer/e-msg-composer.c:1188
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Het bestand is toegankelijk maar open(2) mislukte."
-
-#: composer/e-msg-composer.c:1210
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Het bestand is zeer groot (groter dan 100K).\n"
-"Weet u zeker dat u deze wilt invoegen?"
-
-#: composer/e-msg-composer.c:1231
-msgid "An error occurred while reading the file."
-msgstr "Een fout trad op tijdens het openen van het bestand."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Tekstbestand invoegen..."
 
-#: composer/e-msg-composer.c:1594 composer/e-msg-composer.c:1983
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2077
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
 "aanmaken."
 
-#: composer/e-msg-composer-hdrs.c:324
-msgid "Click here for the address book"
-msgstr "Klik hier voor het adresboek"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:355
-msgid "From:"
-msgstr "Van:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:361
-msgid "Reply-To:"
-msgstr "Antwoordadres:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:372
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: composer/e-msg-composer-hdrs.c:386
-msgid "To:"
-msgstr "Aan:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the recipients of the message"
-msgstr "Geef de geadresseerden"
-
-#: composer/e-msg-composer-hdrs.c:390
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
-
-#: composer/e-msg-composer-hdrs.c:394
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
-"op de geadresseerden-lijst van het bericht verschijnen."
-
-#: composer/evolution-composer.c:369
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5079,7 +5893,7 @@ msgstr ""
 "mislukt, want u heeft nog geen identiteitsgegevens geconfigureerd in het "
 "mail-component."
 
-#: composer/evolution-composer.c:384
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan de berichtenopsteller van Evolution niet initialiseren."
 
@@ -5096,40 +5910,56 @@ msgid "calendar information"
 msgstr "kalenderinformatie"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d-%m-%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d-%m-%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5137,77 +5967,65 @@ msgstr "%a %d-%m-%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "jaar"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "jaren"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "maand"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "maanden"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "week"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "weken"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dagen"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "uur"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "uren"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuut"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuten"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "seconde"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "seconden"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Je bent vergeten een datum te kiezen."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. U hebt een ongeldige datum gekozen."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5217,7 +6035,7 @@ msgstr ""
 "de tijd die het is op het moment dat de filter gestart\n"
 "wordt, of een vfolder wordt geopend."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5225,7 +6043,7 @@ msgstr ""
 "De datum van het bericht zal vergeleken worden met\n"
 "de tijd die u hier invoert."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5236,28 +6054,36 @@ msgstr ""
 "\"een week geleden\", bijvoorbeeld."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "de huidige tijd"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "Een tijd die u specificeert"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "Een tijd relatief aan de huidige tijd"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
@@ -5282,8 +6108,8 @@ msgstr ""
 "Oops, u bent vergeten een map te kiezen.\n"
 "Ga terug en specificeer een geldige map om mail in af te leveren."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:690
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
@@ -5295,46 +6121,6 @@ msgstr "Voer een Map-URI in"
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filters Bewerken"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Bewerk VMappen"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Inkomend"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Uitgaand"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtuele Mappen"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "alleen specifieke mappen"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "VMap-bronnen"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "met alle actieve niet-lokale mappen"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "met alle lokale en actieve niet-lokale mappen"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "met alle lokale folders"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5356,36 +6142,88 @@ msgstr "Regel naam: "
 msgid "Untitled"
 msgstr "Geen Titel"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "inkomend"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "uitgaand"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Toevoegen"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Bewerken"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filters Bewerken"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Bewerk VMappen"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Inkomend"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Uitgaand"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtuele Mappen"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "alleen specifieke mappen"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "VMap-bronnen"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "met alle actieve niet-lokale mappen"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "met alle lokale en actieve niet-lokale mappen"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "met alle lokale folders"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Geef Kleur"
 
 #: filter/libfilter-i18n.h:4
@@ -5461,89 +6299,91 @@ msgid "Expression"
 msgstr "Expressie"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Doorsturen naar Adres"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Belangrijk"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "is groter dan"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "is niet"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Bericht werd ontvangen"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Bericht werd verzonden"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "op of na"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "op of voor"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Gelezen"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Stel Status in"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Grootte"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "klinkt als"
@@ -5560,15 +6400,12 @@ msgstr "Specifieke kop"
 msgid "starts with"
 msgstr "begint met"
 
-#: filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "Status"
-
 #: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -5596,29 +6433,23 @@ msgstr "Regel bewerken"
 msgid "Score Rules"
 msgstr "Bewerk Scoreregel"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importeer"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm-Aliassen"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:195
-msgid "Don't ask me again"
-msgstr "Dit bericht niet meer weergeven."
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5626,15 +6457,15 @@ msgstr ""
 "Evolution heeft Elm mailbestand gevonden\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm-mail"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5642,19 +6473,11 @@ msgstr ""
 "Evolution heeft GnomeCard bestanden geovnden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1455
-msgid "Filters"
-msgstr "Filters"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "Adresboeken"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5662,7 +6485,7 @@ msgstr ""
 "Evolution heeft Netscape mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5670,183 +6493,209 @@ msgstr ""
 "Evolution heeft Pine mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine mail"
 
-#: mail/component-factory.c:624
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution-component voor het afhandelen van post"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution bericht-opsteller."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution post-samenvattingscomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution postmap-weergavecomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution postmap-factorycomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Fabriek voor de Evolution opsteller."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fabriek voor het Evolution post component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Fabriek voor het post-samenvattingscomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Mail configuratie interface"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Eigenschappen..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "De bestandseigenschappen wijzigen"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het Evolution Mail-component niet initialiseren."
 
-#: mail/component-factory.c:750
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser.c:521
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschappen voor \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kon tijdelijke directory niet maken: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Sla op als VMap"
 
-#: mail/folder-browser.c:847
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:850
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:853
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:856
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VFolder op Mailing_Lijst"
 
-#: mail/folder-browser.c:862
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:865
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:868
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:871
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr " Filter op Mailinglijst"
 
-#: mail/folder-browser.c:880
-msgid "_Open"
-msgstr "_Openen"
-
-#: mail/folder-browser.c:882
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Laatste"
 
-#: mail/folder-browser.c:884 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:125 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-#: mail/folder-browser.c:886 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:891 ui/evolution-mail.xml.h:124
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 #, fuzzy
-msgid "_Reply to _List"
+msgid "Reply to _List"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:895 ui/evolution-mail.xml.h:78
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:897
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Markeer Als Gelezen"
 
-#: mail/folder-browser.c:902
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markeer Als Ongelezen"
 
-#: mail/folder-browser.c:907
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Belangrijk"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Markeer Als Ongelezen"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:909
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kopi�ren naar Map..."
 
-#: mail/folder-browser.c:913 ui/evolution-mail.xml.h:128
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:923
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Adresboek Toevoegen"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:927
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:1066
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailinglijst"
 
-#: mail/folder-browser.c:1067
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VFolder op Mailinglijst"
 
-#: mail/folder-browser.c:1069
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:1070
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Eigenschappen voor \"%s\""
-
-#: mail/folder-browser-factory.c:213
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution-component voor het afhandelen van post"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution bericht-opsteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution post-samenvattingscomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution postmap-weergavecomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution postmap-factorycomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabriek voor de Evolution opsteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabriek voor het Evolution post component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Fabriek voor het post-samenvattingscomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Mail configuratie interface"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
@@ -5898,37 +6747,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "U heeft niet alle informatie ingevuld die nodig is."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution Accountbewerker"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbewerker"
 
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Handtekeningbestand:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Dit bericht is nog niet verstuurd.\n"
+"\n"
+"Wilt u de wijzingen opslaan?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (standaard)"
 
-#: mail/mail-accounts.c:209
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Uitzetten."
 
-#: mail/mail-accounts.c:211 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:303
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:463 mail/mail-accounts.c:467
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Verwijderen"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Stel dit in als standaardaccount"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:650
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution Accountbeheer"
 
@@ -5956,7 +6837,7 @@ msgstr "%s mailinglijst"
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5968,7 +6849,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wil u nu e-mail nu configureren?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5976,7 +6857,7 @@ msgstr ""
 "U dient een identiteit te configuren\n"
 "voordat u post kunt versturen."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5984,11 +6865,11 @@ msgstr ""
 "U moet een post-transport configureren\n"
 "voordat u e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5996,38 +6877,46 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "U moet een account configureren voordat u deze e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:605
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Op %s, %s schreef:"
 
-#: mail/mail-callbacks.c:825
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Doorgestuurd bericht:\n"
 
-#: mail/mail-callbacks.c:919
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:921
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:1087
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
 
-#: mail/mail-callbacks.c:1109
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6035,7 +6924,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:1143
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6043,36 +6932,24 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:1155
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-callbacks.c:1176
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:1210 mail/mail-display.c:94
-msgid "Overwrite file?"
-msgstr "Bestand overschrijven?"
-
-#: mail/mail-callbacks.c:1214 mail/mail-display.c:98
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Er bestaat al een bestand met die naam.\n"
-"Overschrijven?"
-
-#: mail/mail-callbacks.c:1258
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:1445
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6081,24 +6958,24 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1503
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filters"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:1550
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:1645
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
-#: mail/mail-config.c:1376 mail/mail-config.c:1379
-msgid "Connecting to server..."
-msgstr "Verbinden met server....."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6144,10 +7021,14 @@ msgstr ""
 "word alleengebruik als 'show' naam."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution Accountwizard"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Verbinden met server....."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "Detecteer ondersteunde types..."
@@ -6157,58 +7038,63 @@ msgid " color"
 msgstr "Kleuren"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Accounts"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Altijd plaatjes van buiten het netwerk laden"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Aanmeldingstype:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automatisch controleren op nieuwe post elke"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Opstellen"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6224,221 +7110,279 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "Standaard doorsturen stijl is:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Default character set: "
 msgstr "Standaard doorsturen stijl is:"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "Weergave"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Klad"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Klad map"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Bewerken..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-mailadres:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Aanzetten"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Volledige Naam:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Handtekeningbestand:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Highligt citaten met"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "in HTML email"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Plaatjes laden als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Mailbox Formaat"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:48
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Markeer berichten als \"Gelezen\" na: "
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Nooi plaatjes van het net afhalen"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nieuws"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Locatie van PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Kies een kleur"
+
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Creeer een regel om de berichten met dit onderwerp te filteren"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail-maildir"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Ontvang opties"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Vereisde informatie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Security"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Selecteer lokatie PGP"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Stuur post standaard in HTML-formaat."
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Berichten aan het versturen"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Bezig met versturen Post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Verzonden"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en kladberichten"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Verzonden berichtenmap"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Servertype: "
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server vereist aanmelding"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Bronnen"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Geen informatie"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Bronnen"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Speciale Mappen"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:88
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Deze server vereist een beveiligde verbinding (SSL)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6448,221 +7392,235 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:96 ui/evolution-message-composer.xml.h:47
-#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "B_ewerken..."
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-crypto.c:59
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "seconden."
+
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Kon geen PHP signature context maken"
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Kon geen PGP verificatie context maken"
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "Kon geen PGP encryptie context maken."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "Kon geen PGP decryptie context maken"
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Kon geen S/MIME ondertekening context maken"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decryptie context maken"
 
-#: mail/mail-display.c:198
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:238
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kon tijdelijke directory niet maken: %s"
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:301
-#, c-format
-msgid "Open in %s..."
-msgstr "Openen in %s..."
-
-#: mail/mail-display.c:303
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:338
-msgid "External Viewer"
-msgstr "Extern Weergave Programma"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Openen in %s..."
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:990
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Extern Weergave Programma"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Open link in browser"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopieer locatie (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Sla op als (FIXME)"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "Kopieer locatie (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Opslaan als..."
+
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr " %d minuten"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d seconden"
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:649
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-mailadres:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Antwoordadres:"
 
-#: mail/mail-format.c:771
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Geen GPG/PGP programma geconfigureerd"
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Klik op het pictogram om te ontsleutelen."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal ondertekend en is authentiek."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
 "het authentiek is."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Verwijzing naar FTP site (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/mail-local.c:504
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Bezig met openen '%s'"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:788
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Verander map van \"%s\" naar \"%s\" formaat"
-
-#: mail/mail-local.c:811
-msgid "Reconfiguring folder"
-msgstr "Map wordt geherconfigureerd"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:840
-msgid "Closing current folder"
-msgstr "Huidige map wordt gesloten"
-
-#: mail/mail-local.c:872
-msgid "Renaming old folder and opening"
-msgstr "Naam oude map wordt gewijzigd en map geopend"
-
-#: mail/mail-local.c:890
-msgid "Creating new folder"
-msgstr "Bezig met aanmaken van nieuwe map"
-
-#: mail/mail-local.c:904
-msgid "Copying messages"
-msgstr "Bezig met het kopi�ren van berichten"
-
-#: mail/mail-local.c:921
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6671,7 +7629,7 @@ msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:960
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6679,12 +7637,17 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1046
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "U kunt geen berichten kopieeren vanuit deze vuilnisbak"
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Configureer %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6693,7 +7656,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6702,120 +7665,104 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Bezig"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution voortgang"
-
-#: mail/mail-ops.c:607
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:611
-msgid "Sending message"
-msgstr "Bezig met versturen bericht"
-
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bezig met verzenden bericht %d van %d"
 
-#: mail/mail-ops.c:745
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht in map"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-#: mail/mail-ops.c:928
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Bezig met kopi�ren"
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1167
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Prullenbak"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1208 mail/mail-ops.c:1346
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1275
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1414
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1498
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "Verplaatsen map %s naar %s"
-
-#: mail/mail-ops.c:1500
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "Kopieeren map %s naar %s"
-
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Map wordt ververest"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1805
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen berichten"
 
-#: mail/mail-ops.c:1815
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1889
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van berichten"
 
-#: mail/mail-ops.c:1968
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6824,12 +7771,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1981
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6838,11 +7780,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2084
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6851,12 +7793,12 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2112
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2179
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
@@ -6865,214 +7807,174 @@ msgstr "Verbreken van %s"
 msgid "(Untitled Message)"
 msgstr "(Naamloos)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Naamloos)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Bericht"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Vind in bericht"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Zoek doorgestuurde"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Zoek:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Klopt:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Zoeken"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "annuleren ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Versturen en ontvangen van berichten"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Aan het ontvangen"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Aan het Verzenden"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: mail/mail-tools.c:157
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Gebruiker heeft operatie afgebroken."
+
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
-#: mail/mail-tools.c:205
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (doorgestuurd bericht)"
-
-#: mail/mail-tools.c:215
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (geen onderwerp)"
-
-#: mail/mail-tools.c:232
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
-#: mail/mail-tools.c:234
-msgid "Forwarded message (no subject)"
-msgstr "Doorgestuurd bericht (geen onderwerp)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Doorgestuurde berichten"
 
-#: mail/mail-tools.c:447
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Doorgestuurd Bericht-----<br><b>Van:</b> %s<br><b>Aan:</b> "
-"%s<br><b>Onderwerp:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Doorgestuurde berichten"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:76
-msgid "Reply"
-msgstr "Beantwoorden"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "Beantwoord dit bericht"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:77
-msgid "Reply to All"
-msgstr "Iedereen beantwoorden"
-
-#: mail/message-browser.c:200
-msgid "Reply to all recipients of this message"
-msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:39
-msgid "Forward"
-msgstr "Doorsturen"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "Dit bericht doorsturen"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "Druk dit bericht af"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "Verwijder dit bericht"
-
-#: mail/message-browser.c:216 ui/evolution-mail.xml.h:70
-msgid "Previous"
-msgstr "Vorige"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "Vorige bericht"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:63
-msgid "Next"
-msgstr "Volgende"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "Volgende bericht"
-
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "Gebruiker heeft operatie afgebroken."
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Bezig met het opslaan van berichten"
+
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Gevlagd"
+
+#: mail/message-list.etspec.h:4
+msgid "Received"
+msgstr "Ontvangen"
+
+#: mail/message-list.etspec.h:7
+msgid "Size"
+msgstr "Grootte"
 
-#: mail/subscribe-dialog.c:76
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Map"
 
@@ -7100,15 +8002,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Beheer Postbusabonnementen..."
 
-#: shell/e-setup.c:124 shell/e-setup.c:197
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Evolution-component voor de samenvatting."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Fabriek voor het Evolution-samenvattingscomponent."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan het Samenvattingscomponent van Evolution niet initializeren"
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Afspraken"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Toon afspraken"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Samenvatting"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Er is een fout opgetreden tijdens het laden van het kalender bestand."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Fout bij laden van kalender</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Toon taken"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Secties:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B, %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Afdrukken van bericht mislukt"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): kon Bonobo niet initializeren"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Wissen"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "Ingebonden"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Uitzetten."
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Opmerkingen"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Aa_ntekeningen:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Plakken"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Bronnen"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "maand"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Laagste"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Laagste"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Weergeven"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Omschrijving bevat:"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Opnieuw Zoeken"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "nu"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualiseer nu"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Omschrijving bevat:"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Post"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Toon een dialoogvenster"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Primaire E-mail"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Berichten aan het ontvangen"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Onbekende aanmeldingsstatus"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Light precipitation"
+msgstr "Highligt citaten met"
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Onbekende fout"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Uitnodigingen voor de bijeenkomst"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Mjfr."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Staand"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Mailinglijst"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Dit venster sluiten"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Score"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Toon taken"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Dit venster sluiten"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Versturen"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Kop"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dagen"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Augustus"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Dingen te doen"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Dingen te doen"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Beantwoord"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Selecteer Map"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Alle Aanwezigen"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Geef mappen weer die beginnen met:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Weergave-instellingen"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Weergave"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Vrijdag"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Instellingen:"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr " 1 dag"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "maand"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 week"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Plan\n"
+"Tijd"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Toon taken"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Koppen"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Toon taken"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Taken"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Eenheid:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Overige"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Selectie wissen"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "April"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "De Evolution schil."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Details"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Afspraak annuleren"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Speciale Mappen"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution-installatie"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7116,29 +9459,25 @@ msgstr ""
 "Deze nieuwe versie van Evolution moet enkele extra bestanden installeren\n"
 "in uw persoonlijke Evolution-directory"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
 "breken."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct actualiseren"
 
-#: shell/e-setup.c:172 shell/e-setup.c:240
-msgid "Evolution files successfully installed."
-msgstr "Evolution bestanden succesvol ge�nstalleerd."
-
-#: shell/e-setup.c:201
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Het lijkt erop dat dit de eerste keer is dat u Evolution start."
 
-#: shell/e-setup.c:202
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Klik op \"OK\" om de Evolution-bestanden te installeren in"
 
-#: shell/e-setup.c:221
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7149,16 +9488,14 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-#: shell/e-setup.c:236
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kan de bestanden niet kopi�ren naar\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Een fout trad op tijdens het openen van het bestand."
 
-#: shell/e-setup.c:303
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7169,7 +9506,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-setup.c:317
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -7178,7 +9515,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:342
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7189,39 +9526,56 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-shell.c:391
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan de lokale opslag niet opzetten -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: shell/e-shell.c:1256
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Kan de bestanden niet kopi�ren naar\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
-"Dit betekent waarschijnlijk dat het %s component is gecrasht"
 
-#: shell/e-shell-folder-commands.c:239
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "specificeer een map om map \"%s\" naar te kopieeren:"
 
-#: shell/e-shell-folder-commands.c:244
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Kopieer naar Map"
 
-#: shell/e-shell-folder-commands.c:281
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Specificeer een map om map \"%s\" naartoe te verplaatsen:"
 
-#: shell/e-shell-folder-commands.c:286
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Verplaats naar Map"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Verwijder deze map"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Weet u zeker dat u de taak `%s' wilt verwijderen?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "verwijderen map %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7230,15 +9584,15 @@ msgstr ""
 "Kan de gespecificeerde map niet aanmaken:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "De opgegeven mapnaam is niet geldig."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe map maken"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7246,11 +9600,11 @@ msgstr ""
 "Het type van de geselecteerde map is niet geldig\n"
 "voor de opdracht."
 
-#: shell/e-shell-folder-selection-dialog.c:328
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nieuw..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
@@ -7359,51 +9713,19 @@ msgstr "Selecteer een doelmap voor deze belangrijke data"
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
-#: shell/e-shell-view.c:167
-msgid "(No folder displayed)"
-msgstr "(Geen map weergegeven)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1383
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1400
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1402
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1440
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution is nu online.  Klik op dit button om ofline te werken"
-
-#: shell/e-shell-view.c:1447
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in bezig offline te gaan."
-
-#: shell/e-shell-view.c:1453
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution is nu offline. Klik op deze knop on online te werken."
-
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy kon niet worden gevonden in het $PATH."
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:232
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7413,35 +9735,89 @@ msgstr ""
 "programma's voor post, planning en contactbeheer\n"
 "in de GNOME werkomgeving."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ga naar map..."
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:652
-msgid "Work online"
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
+
+#: shell/e-shell-view-menu.c:584
+#, fuzzy
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Selecteer de map die je wilt openen"
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Werk met netwerk"
 
-#: shell/e-shell-view-menu.c:664 shell/e-shell-view-menu.c:676
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shortcuts.c:382
-msgid "Error saving shortcuts."
-msgstr "Fout bij opslaan van snelkoppelingen."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Geen map weergegeven)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution is nu online.  Klik op dit button om ofline te werken"
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in bezig offline te gaan."
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution is nu offline. Klik op deze knop on online te werken."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
+"Dit betekent waarschijnlijk dat het %s component is gecrasht"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Nieuwe snelkoppelingsgroep aanmaken"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Groep:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7450,110 +9826,204 @@ msgstr ""
 "Wil u echt de groep `%s' verwijderen\n"
 "van de snelkoppelingsbalk?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Kleine Pictogrammen"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine pictogrammen"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Grote Pictogrammen"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote pictogrammen"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Deze Groep _Verwijderen..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Verberg de Snelkoppelingsbalk"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activeren"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Openen"
+
+#: shell/e-shortcuts-view.c:474
+#, fuzzy
+msgid "Open the folder linked to this shortcut"
+msgstr "Open deze map in een nieuw venster"
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Open in Nieuw Venster"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Open het geselecteerde bericht in een nieuw venster"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Hernoemen..."
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activeer deze snelkoppeling"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Fout bij opslaan van snelkoppelingen."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Snelkoppelingsbalk"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "C_ontacten...."
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Geen naam)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Generieke fout"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Functie niet ge�mplementeerd voor deze opslag"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Operatie niet toegestaan"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Vo_ltooid:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Verbindeingen ophangen...."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Computernaam:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mapnaam:"
@@ -7566,10 +10036,6 @@ msgstr "Maptype:"
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "De Evolution schil."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7594,31 +10060,35 @@ msgstr ""
 "Deze wizard helpt u bij het importeren\n"
 "van externe bestanden in Evolution."
 
-#: shell/importer/intelligent.c:187
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importeerders"
 
-#: shell/importer/intelligent.c:193
+#: shell/importer/intelligent.c:197
 #, fuzzy
 msgid "Don't import"
 msgstr "Niet verwijderen"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Dit bericht niet meer weergeven."
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7642,7 +10112,7 @@ msgstr ""
 "We hopen dat u de vruchten van ons harde werk waardeert, en we wachten met\n"
 "smart op uw bijdragen!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7650,27 +10120,29 @@ msgstr ""
 "Bedankt\n"
 "Het Evolution-Team\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Kan de Evolution-schil niet initialiseren."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Sluit splash screen uit"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo-componentensysteem niet initializeren"
 
-#: ui/evolution-addressbook.xml.h:1
-msgid "C_ut"
-msgstr "K_nippen"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopi�ren"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopieer de selectie"
 
@@ -7678,54 +10150,66 @@ msgstr "Kopieer de selectie"
 msgid "Create new contact"
 msgstr "Nieuw contact maken"
 
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Nieuw contact maken"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Knippen"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
-#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Verwijder geselecteerde contacten"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nieuw contact"
 
 #: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nieuws"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Plakken"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:69
-msgid "Previews the message to be printed"
-msgstr "Geeft een afdrukvoorbeeld van het bericht"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "Druk geselecteerde contacten af"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "Select everything"
-msgstr "Selecteer alles"
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Geef alle contacten weer"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "View All"
-msgstr "Allen Weergeven"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "View all contacts"
-msgstr "Geef alle contacten weer"
-
 #: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Adresboekbronnen"
@@ -7735,177 +10219,222 @@ msgid "_Contact"
 msgstr "C_ontacten...."
 
 #: ui/evolution-addressbook.xml.h:24
-msgid "_Copy"
-msgstr "_Kopi�ren"
-
-#: ui/evolution-addressbook.xml.h:25
-msgid "_Paste"
-msgstr "_Plakken"
+#, fuzzy
+msgid "_Contact Group"
+msgstr "C_ontacten...."
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Zoek naar contacten"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Dagen"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Instellingen Wijzigen"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Creeer een nieuw 'hele dag' Event"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Maak een nieuwe afspraak"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Maak een nieuwe kalender"
+msgid "Create a new appointment"
+msgstr "Maak een nieuwe afspraak"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ga naar"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Ga terug in de tijd"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Ga vooruit in de tijd"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ga Naar Datum"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Ga Naar Vandaag"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ga naar een specifieke datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ga naar het heden"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Maand"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Nieuwe Ka_lender"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Open Kalender"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Vorige"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nieuwe afspraak"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Druk Kalender af"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Druk deze Kalender af"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Opslaan Als"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Vereisde informatie"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Kalender bewaren als iets anders"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Toon 1 dag"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Toon 1 maand"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Toon 1 week"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Toon de werkweek"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Vandaag"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Werkweek"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Week"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Afspraak"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Postinstellingen..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "Maand"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution.xml.h:58
-msgid "_New"
-msgstr "_Nieuw"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "Open Ka_lender"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "Week"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Sluiten"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Deze afspraak sluiten"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Verwijder deze afspraak"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Hoofdgereedschapsbalk"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Geeft een afdrukvoorbeeld van het bericht"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Afdruk_voorbeeld"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Printerinstellingen"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Item afdrukken"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Afdrukken..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Opslaan en Sluiten"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Bewaar de afspraak en sluit dit venster"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Verander de weergave in %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Stel de pagina instellingen in voor de huidige printer"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Acties"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Bestand"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Verwijder dit item"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Verwijderen..."
 
@@ -7917,24 +10446,12 @@ msgstr "Help"
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-task-editor.xml.h:6
-msgid "Print this item"
-msgstr "Item afdrukken"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-task-editor.xml.h:7
-msgid "Print..."
-msgstr "Afdrukken..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Save and Close"
-msgstr "Opslaan en Sluiten"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Bewaar dit contact en sluit het dialoogvenster"
@@ -7951,76 +10468,75 @@ msgstr "Zie help"
 msgid "Send _message to contact..."
 msgstr "Stuur _bericht aan contact..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:16
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor.xml.h:10 ui/evolution.xml.h:49
-msgid "_File"
-msgstr "_Bestand"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-message-composer.xml.h:55
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Opslaan"
 
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Verwijder dit item"
+
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Bewaar deze taak en sluit het dialoogvenster"
+
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Stu_ur contact naar ander..."
+
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Stuur _bericht aan contact..."
+
 #: ui/evolution-event-editor.xml.h:1
 #, fuzzy
 msgid "Cancel Mee_ting"
 msgstr "Afspraak annuleren"
 
-#: ui/evolution-event-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
 #, fuzzy
-msgid "Cancel then meeting for this item"
+msgid "Cancel the meeting for this item"
 msgstr "Verander de eigenschappen van deze map"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Doorsturen als v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Dit bericht doorsturen"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor.xml.h:3
-#, fuzzy
-msgid "Preview the printed item"
-msgstr "Geeft een afdrukvoorbeeld van het bericht"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor.xml.h:4
-msgid "Print Pre_view"
-msgstr "Afdruk_voorbeeld"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:5
-#, fuzzy
-msgid "Print S_etup"
-msgstr "Printerinstellingen"
-
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Re_fresh Meeting"
 msgstr ""
 "Verzoek\n"
 "Bijeenkomst"
 
-#: ui/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "_Bijeenkomst Plannen"
 
-#: ui/evolution-event-editor.xml.h:13
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Bijeenkomst plannen"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor.xml.h:8
-msgid "Setup the page settings for your current printer"
-msgstr "Stel de pagina instellingen in voor de huidige printer"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "_Acties"
 
@@ -8029,486 +10545,607 @@ msgstr "_Acties"
 msgid "Customise My Evolution"
 msgstr "%s - Evolution %s"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "Pas filter regels toe op geselecteerde berichten"
-
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Stop de huidige email operatie"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Opstellen"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Stel een nieuw bericht op"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "Creeer of bewerk regels om nieuwe berichten te filteren"
+
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr "Creeer of bewerk definities van virtuele mappen"
+
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Leeg Prullenbak"
+
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Wachtwoorden _Vergeten"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Vergeet de onthouden wachtwoorden zodat ze opnieuw gevraagd worden.."
+
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Beheer Postbusabonnementen..."
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr "Open een venster om een emailbericht op te stellen"
+
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Verwijder alle verwijderde berichten permanent uit alle mappen"
+
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Verstuur en Ontvang"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
+
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "Laat berichten in normale stijl zien"
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Abboneer of zegt abbo op op de mappen op de server"
+
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Virtuele-Mapbewerker..."
+
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filters..."
+
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Bericht versturen"
+
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Postinstellingen..."
+
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Voorbeeld"
+
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "Verstuur en Ontvang"
+
+#: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Verander de eigenschappen van deze map"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Opstellen"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Verberg geselecteerde"
+
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Druk dit bericht af"
+
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Verberg geselecteerde"
+
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Verberg verwijderde"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Doorgestuurde berichten"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Verberg de weggegooide berichten in plaats van ze te laten zien met een "
+"streep erdoor"
+
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Markeer Als Gelezen"
+
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "Markeer alle zichtbare berichten als gelezen"
+
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Plak het klembord"
+
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Verwijder alle verwijderde berichen permanent uit deze map"
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "_Alles Selecteren"
+
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Selecteer _Gerelateerde Berichten"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr "Selecteer alle en alleen de berichten die nu niet zijn geselecteerd"
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+"Selecteer alle berichten in dezelfde thread als het geselecteerde bericht"
+
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "Selecteer alle zichtbare berichten"
+
+#: ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Show _All"
+msgstr "Allen Weergeven"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "Laat berichten zien de tijdelijk zijn verborgen"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Verberg tijdelijk alle berichten die al zijn gelezen"
+
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "Verberg tijdelijk de geselecteerde berichten"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Wissen"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Map"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Selectie _Inverteren"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Eigenschappen..."
+
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
+
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Pas filter regels toe op geselecteerde berichten"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
 #, fuzzy
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Beantwoord dit bericht"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Beantwoord dit bericht"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Kopieer het bericht naar een andere map"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Maak VMap Van Bericht"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Creeer een regel om de berichten van deze afzender te filteren"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Creeer een regel om de berichten van deze afzenders te filteren"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Creeer een regel om de berichten naar deze emaillijst te filteren"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Creeer een regel om de berichten met dit onderwerp te filteren"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Creeer een Virtueele map voor deze ontvangers"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Creer een virtueele map voor deze emaillijst"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Creeer een virtuele map voor deze afzender"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Creeer een virtuele map voor dit onderwerp"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit rules for filtering new mail"
-msgstr "Creeer of bewerk regels om nieuwe berichten te filteren"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Create or edit virtual folder definitions"
-msgstr "Creeer of bewerk definities van virtuele mappen"
-
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "Laat het volgende belangrijke bericht zien"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "Laat volgende bericht zien"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "Laat het volgende ongelezen bericht zien"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "Laat de volgende ongelezen draad zien"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "Laat het vorige belangrijke bericht zien"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "Laat het vorige bericht zien"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "Laat het vorige ongelezen bericht zien"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Empty _Trash"
-msgstr "Leeg Prullenbak"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filter op Mailinglijst"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filter op _Afzender"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filter op _Geadresseerden"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filter op _Onderwerp"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forceer het laden van plaatjes in HTML email"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Forget _Passwords"
-msgstr "Wachtwoorden _Vergeten"
-
-#: ui/evolution-mail.xml.h:38
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Vergeet de onthouden wachtwoorden zodat ze opnieuw gevraagd worden.."
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Doorsturen"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Doorsturen Als"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Stuur door als bijvoegsel"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Ingebonden doorsturen"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Geciteerd doorsturen"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "Stuur het geselecteerde bericht door in de body van een nieuw bericht"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "Stuur het bericht geciteerd door alsof het een antwoord is"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "Stuur het bericht door naar iemand"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Stuur het bericht door naar iemand als bijlage"
 
-#: ui/evolution-mail.xml.h:48
-#, fuzzy
-msgid "Hide S_elected Messages"
-msgstr "Verberg geselecteerde"
-
-#: ui/evolution-mail.xml.h:49
-#, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Verberg verwijderde"
-
-#: ui/evolution-mail.xml.h:50
-#, fuzzy
-msgid "Hide _Read messages"
-msgstr "Doorgestuurde berichten"
-
-#: ui/evolution-mail.xml.h:51
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Verberg de weggegooide berichten in plaats van ze te laten zien met een "
-"streep erdoor"
-
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Laad Plaatjes"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Manage _Subscriptions..."
-msgstr "Beheer Postbusabonnementen..."
-
-#: ui/evolution-mail.xml.h:54
-msgid "Mar_k As Read"
-msgstr "Markeer Als Gelezen"
-
-#: ui/evolution-mail.xml.h:55
-msgid "Mark All as R_ead"
-msgstr "Markeer Als Gelezen"
-
-#: ui/evolution-mail.xml.h:56
-msgid "Mark As U_nread"
-msgstr "Markeer Als _Ongelezen"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Belangrijk"
 
-#: ui/evolution-mail.xml.h:57
-msgid "Mark all visible messages as read"
-msgstr "Markeer alle zichtbare berichten als gelezen"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Markeer Als Ongelezen"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Markeer het geselecteerde bericht alsof het gelezen is"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Markeer het geselecteerde bericht om te verwijderen"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Markeer het geselecteerde bericht alsof het niet gelezen is"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Markeer het geselecteerde bericht om te verwijderen"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Markeer het geselecteerde bericht om te verwijderen"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Verplaats de geselecteerde berichten naar een andere map"
 
-#: ui/evolution-mail.xml.h:64
-msgid "Open a window for composing a mail message"
-msgstr "Open een venster om een emailbericht op te stellen"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Volgende"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Volgende bericht"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Volgende bericht"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Selecteer _Gerelateerde Berichten"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Volgende bericht"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Open het geselecteerde bericht in een nieuw venster"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Open het geselecteerde bericht in de opsteller om het opnieuw te zenden"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Verwijder alle verwijderde berichten permanent uit alle mappen"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Geeft een afdrukvoorbeeld van het bericht"
 
-#: ui/evolution-mail.xml.h:68
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Verwijder alle verwijderde berichen permanent uit deze map"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Vorige"
+
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Vorige bericht"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Vorige bericht"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Vorige bericht"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Bericht afdrukken..."
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Afdrukvoorbeeld..."
 
-#: ui/evolution-mail.xml.h:74
-msgid "Print message to the printer"
-msgstr "Bericht afdrukken naar de printer"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Bericht Afdrukken"
 
-#: ui/evolution-mail.xml.h:75
-msgid "Redirect (FIXME: implement me)"
-msgstr "Omleiden (FIXME: implementeer mij)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Beantwoorden"
 
-#: ui/evolution-mail.xml.h:79
-#, fuzzy
-msgid "Reply to _List"
-msgstr "Iedereen Be_antwoorden"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Iedereen beantwoorden"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "Zoek bericht"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Sla bericht op als tekstbestand"
 
-#: ui/evolution-mail.xml.h:82
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: ui/evolution-mail.xml.h:83 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "_Alles Selecteren"
-
-#: ui/evolution-mail.xml.h:84
-msgid "Select _Thread"
-msgstr "Selecteer _Gerelateerde Berichten"
-
-#: ui/evolution-mail.xml.h:85
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Selecteer alle en alleen de berichten die nu niet zijn geselecteerd"
-
-#: ui/evolution-mail.xml.h:86
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selecteer alle berichten in dezelfde thread als het geselecteerde bericht"
-
-#: ui/evolution-mail.xml.h:87
-msgid "Select all visible messages"
-msgstr "Selecteer alle zichtbare berichten"
-
-#: ui/evolution-mail.xml.h:88
-msgid "Send / Receive"
-msgstr "Verstuur en Ontvang"
-
-#: ui/evolution-mail.xml.h:89
-msgid "Send queued mail and retrieve new mail"
-msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
-
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:91
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Koppen"
 
-#: ui/evolution-mail.xml.h:92
-#, fuzzy
-msgid "Show _All"
-msgstr "Allen Weergeven"
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Laat berichten in normale stijl zien"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Laat berichten zien met alle email headers"
 
-#: ui/evolution-mail.xml.h:95
-msgid "Show messages that have been temporarily hidden"
-msgstr "Laat berichten zien de tijdelijk zijn verborgen"
-
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Laat de ruwe emailbron van het bericht zien"
 
-#: ui/evolution-mail.xml.h:97
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Abboneer of zegt abbo op op de mappen op de server"
-
-#: ui/evolution-mail.xml.h:98
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Verberg tijdelijk alle berichten die al zijn gelezen"
-
-#: ui/evolution-mail.xml.h:99
-msgid "Temporarily hide the selected messages"
-msgstr "Verberg tijdelijk de geselecteerde berichten"
-
-#: ui/evolution-mail.xml.h:100
-msgid "Threaded Message list"
-msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
-
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Maak verwijderen ongedaan van de geselecteerde berichten"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VMap op Mailinglijst"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VMap op Geadresseerden"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VMap op Onderwerp"
 
-#: ui/evolution-mail.xml.h:106
-msgid "Virtual Folder _Editor..."
-msgstr "_Virtuele-Mapbewerker..."
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Maak Filter Van Bericht"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Expunge"
-msgstr "_Wissen"
-
-#: ui/evolution-mail.xml.h:112
-msgid "_Filters..."
-msgstr "_Filters..."
-
-#: ui/evolution-mail.xml.h:113 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "_Map"
-
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Bericht Doorsturen"
 
-#: ui/evolution-mail.xml.h:115 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Selectie _Inverteren"
-
-#: ui/evolution-mail.xml.h:116
-msgid "_Mail Message"
-msgstr "_Bericht versturen"
-
-#: ui/evolution-mail.xml.h:117
-msgid "_Mail Settings..."
-msgstr "Postinstellingen..."
-
-#: ui/evolution-mail.xml.h:118
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Berichten"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: ui/evolution-mail.xml.h:120
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Weergave"
 
-#: ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "Open Bericht"
 
-#: ui/evolution-mail.xml.h:122 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
-
-#: ui/evolution-mail.xml.h:123
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Bericht Opnieuw Versturen"
 
-#: ui/evolution-mail.xml.h:126
-msgid "_Send / Receive"
-msgstr "Verstuur en Ontvang"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Dit venster sluiten"
 
-#: ui/evolution-mail.xml.h:127
-#, fuzzy
-msgid "_Threaded Message List"
-msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Gereedschapsbalken _Aanpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Aanpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Gereedschapsbalken aanpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Sluiten"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "Weerga_ve"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijlage invoegen"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Voeg een bestand toe als bijlage"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
@@ -8533,50 +11170,57 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Tekstbestand invoegen..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Voeg een bestand bij het bericht"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Tekstbestand invoegen..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Bestand openen"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Versleutelen met PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Signeren met PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Versleutelen met S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME Ondertekening"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:241
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Opslaan"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "Kla_d Opslaan"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Opslaan Als"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Opslaan in _map... (FIXME)"
+msgid "Save _Draft"
+msgstr "Kla_d Opslaan"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
@@ -8649,102 +11293,136 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Schakel Antwoordadres-weergave aan/uit"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Bestand bijvoegen..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Bcc-veld"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Cc-veld"
 
-#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Debug"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "Verwijder Alles"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Van-veld"
 
-#: ui/evolution-message-composer.xml.h:50 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "_Help"
-
 #: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Invoegen"
 
 #: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "Voeg tekstbestand _in... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "_Openen..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Beveiliging"
 
-#: ui/evolution-message-composer.xml.h:57 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "Weerga_ve"
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Help"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Neem abonnement op deze map"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Map"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Lijst Verversen"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Lijst of Mappen Verversen"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Beeindig abonnement op deze map"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Annuleren"
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Verwijder deze taak"
+
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Lijst Verversen"
+
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Verwijder de geselecteerde taken"
+
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
 #: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Verwijder de geselecteerde taken"
+
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Verwijder de geselecteerde taken"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nieuwe Taak"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Plak het klembord"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Bewaar taak als iets anders"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Tasks Preferences..."
-msgstr "Taakvoorkeuren..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Postinstellingen..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Taak"
 
@@ -8760,211 +11438,194 @@ msgstr "Voeg toe aan Snelkoppelingsbalk"
 msgid "Change the name of this folder"
 msgstr "Verander de naam van deze map"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Verander de eigenschappen van deze map"
-
 #: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dit venster sluiten"
-
-#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopieer deze map"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Creeer een verbinding naar deze map op de snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Maak een nieuwe map aan"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "Gereedschapsbalken _Aanpassen"
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "Aanpassen"
-
 #: ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "Gereedschapsbalken aanpassen"
-
-#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Verwijder deze map"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Afsluiten"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution Venster"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolutionbalk _snelkoppeling"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importeer een extern bestandsformaat"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "Hoofdgereedschapsbalk"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Verplaats deze map naar een andere plaats"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "Open in Nieuw Venster"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Open in Nieuw Venster"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Open deze map in een nieuw venster"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Toon informatie over Evolution"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Cont_actbeheerder"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Gebruik van het _Mailcomponent"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "Werk zonder netwerk"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "Kopi�ren...."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importeer bestand..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Bericht versturen"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nieuw"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Hernoemen..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Snelkoppelingsbalk"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Werk zonder netwerk"
 
+#: ui/my-evolution.xml.h:1
+#, fuzzy
+msgid "Change the settings for My Evolution"
+msgstr "Verander de eigenschappen van deze map"
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Postinstellingen..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "adreskaart"
@@ -8997,9 +11658,12 @@ msgstr "Berichten"
 msgid "With Category"
 msgstr "Op Categorie:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Voorlopig"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9073,13 +11737,6 @@ msgstr "_Einde bijeenkomst:"
 msgid "All Attendees"
 msgstr "Alle Aanwezigen"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Huidige Weergave"
@@ -9090,52 +11747,128 @@ msgstr "Defineer Bekijkmogelijkheid"
 
 #. 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Vandaag"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "De datum moet ingevoerd worden in het formaat: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "Basis"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "week"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Prullenbak"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Transactie mislukt"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Nieuws"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Onbekende fout: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "Standaard doorsturen stijl is:"
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Overige"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Contacten Bewerken"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Bewaar zoekopdracht"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Opslaan Als..."
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Allen Weergeven"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Bewerken..."
-
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Uitgebreid..."
@@ -9189,47 +11922,375 @@ msgstr "init_corba(): kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
-#~ msgid "%A, %e %B %Y"
-#~ msgstr "%A, %e %B, %Y"
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Instellingen Wijzigen"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Taakvoorkeuren..."
 
-#~ msgid "Appointments"
-#~ msgstr "Afspraken"
+#~ msgid "???"
+#~ msgstr "???"
 
-#~ msgid "%I:%M%p"
-#~ msgstr "%I:%M%p"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacten..."
 
-#~ msgid "<b>Error loading calendar</b>"
-#~ msgstr "<b>Fout bij laden van kalender</b>"
+#~ msgid "_Company:"
+#~ msgstr "_Bedrijf:"
 
-#~ msgid "<b>Error loading calendar:<br>Method not supported"
-#~ msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
+#~ msgid "Find..."
+#~ msgstr "Zoek..."
 
-#~ msgid "Show appointments"
-#~ msgstr "Toon afspraken"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#~ msgid "Show tasks"
-#~ msgstr "Toon taken"
+#~ msgid "Open calendar"
+#~ msgstr "Open kalender"
 
-#~ msgid "Things to do"
-#~ msgstr "Dingen te doen"
+#~ msgid "Save calendar"
+#~ msgstr "Kalender opslaan"
 
-#~ msgid "Edit Task"
-#~ msgstr "Taak Bewerken"
+#~ msgid "Settings..."
+#~ msgstr "Instellingen..."
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarm stopt na"
+
+#~ msgid "Colors"
+#~ msgstr "Kleuren"
 
-#~ msgid "Appointment - %s"
-#~ msgstr "Afspraak - %s"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Maak sluimeren mogelijk voor"
 
-#~ msgid "Task - %s"
-#~ msgstr "Taak - %s"
+#~ msgid "Highlight"
+#~ msgstr "Markeer"
 
-#~ msgid "Journal entry - %s"
-#~ msgstr "Dagboekelement - %s"
+#~ msgid "Items Due Today:"
+#~ msgstr "Items die vandaag verlopen:"
 
-#~ msgid "No summary"
-#~ msgstr "Geen samenvatting"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Items die nog niet zijn verlopen"
 
-#~ msgid "Attendee"
-#~ msgstr "Aanwezige"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Items die nog niet zijn verlopen:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Verlopen items:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaakBlad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tijd Tot Verlooptijd"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuele Alarmen"
+
+#~ msgid "Work week"
+#~ msgstr "Werkweek"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "Percent complete"
+#~ msgstr "Percentage voltooid"
+
+#~ msgid "Edit this task"
+#~ msgstr "Bewerk deze taak"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ga Naar Vandaag"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Verwijder alle Gebeurtenissen"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Component successvol geactualiseerd."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Kon uw kalender bestand niet laden!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Kon uw kalender bestand niet lezen!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dit is een antwoord van iemand die niet was uitgenodigd!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kon uw kalenderopslag niet actualiseren."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Ik kon het kalender component niet verwijderen!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Component successvol verwijderd."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Type kalendercomponent niet herkend."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Toevoegen aan Kalender"
+
+#~ msgid " Tentative "
+#~ msgstr " Voorlopig"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Kalender actualiseren"
+
+#~ msgid "Summary contains"
+#~ msgstr "Bondige inhoud bevat"
+
+#~ msgid "Comment contains"
+#~ msgstr "Commentaar bevat"
+
+#~ msgid "Has category"
+#~ msgstr "Heeft Categorie:"
+
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now verwacht 0 argumenten"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time verwacht 1 argument"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time verwacht dat argument 1 een string is"
+
+#~ msgid "make-time argument 1 must be an ISO 8601 date/time string"
+#~ msgstr "make-time argument 1 moet een ISO-8601 date/time string zijn"
+
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day verwacht 2 argumenten"
+
+#~ msgid "time-add-day expects argument 1 to be a time_t"
+#~ msgstr "time-add-day verwacht dat argument 1 een time_t is"
+
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr "time-add-day verwacht dat argument 2 een integer is"
+
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin verwacht 1 argument"
+
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr "time-day-bewgin verwacht dat argument 1 een time_t is"
+
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "time-dat-end verwacht 1 argument"
+
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "time-dat-end verwacht dat argument 1 een time_t is"
+
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype verwacht geen argumenten"
+
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "occur-in-time-range? verwacht 2 argumenten"
+
+#~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
+#~ msgstr "occur-in-time-range? verwacht dat argument 1 een time_t is"
+
+#~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
+#~ msgstr "occur-in-time-range? verwacht dat argument 2 een time_t is"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "Bevat? verwacht 2 argumenten"
+
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? verwacht dat argument 1 een string is"
+
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? verwacht dat argument 2 een string is"
+
+#~ msgid ""
+#~ "contains? expects argument 1 to be one of \"any\", \"summary\", "
+#~ "\"description\""
+#~ msgstr ""
+#~ "contains? verwacht dat argument 1 een kleuze is uit "
+#~ "\"any\",\"summary\",\"description\""
+
+#~ msgid "has-categories? expects at least 1 argument"
+#~ msgstr "has-categories? verwacht op zijn minst 1 argument"
+
+#~ msgid "has-categories? expects all arguments to be strings"
+#~ msgstr "has-categories? verwacht dat alle argumenten strings zijn"
+
+#~ msgid "Evaluation of the search expression did not yield a boolean value"
+#~ msgstr "Evaluation of the search expression did not yield a boolean value"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Bezig met scannen IMAP-map"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon handtekeningsbestand %s niet openen:\n"
+#~ "%s"
+
+#~ msgid "That file does not exist."
+#~ msgstr "Het bestand bestaat niet."
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Het is geen gewoon bestand."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Het bestand bestaat maar is niet leesbaar."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Het bestand is toegankelijk maar open(2) mislukte."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Het bestand is zeer groot (groter dan 100K).\n"
+#~ "Weet u zeker dat u deze wilt invoegen?"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Doorsturen naar Adres"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm-Aliassen"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adresboeken"
+
+#, fuzzy
+#~ msgid "_Reply to _List"
+#~ msgstr "Iedereen Be_antwoorden"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Verander map van \"%s\" naar \"%s\" formaat"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Map wordt geherconfigureerd"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Huidige map wordt gesloten"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Naam oude map wordt gewijzigd en map geopend"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Bezig met aanmaken van nieuwe map"
+
+#~ msgid "Copying messages"
+#~ msgstr "Bezig met het kopi�ren van berichten"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution voortgang"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "Verplaatsen map %s naar %s"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "Kopieeren map %s naar %s"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (doorgestuurd bericht)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (geen onderwerp)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Doorgestuurd bericht (geen onderwerp)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Doorgestuurd Bericht-----<br><b>Van:</b> %s<br><b>Aan:</b> "
+#~ "%s<br><b>Onderwerp:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "Beantwoord dit bericht"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
+
+#~ msgid "Forward this message"
+#~ msgstr "Dit bericht doorsturen"
+
+#~ msgid "Delete this message"
+#~ msgstr "Verwijder dit bericht"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution bestanden succesvol ge�nstalleerd."
+
+#~ msgid "Activate"
+#~ msgstr "Activeren"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activeer deze snelkoppeling"
+
+#~ msgid "Select everything"
+#~ msgstr "Selecteer alles"
+
+#~ msgid "View All"
+#~ msgstr "Allen Weergeven"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Dagen"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Maak een nieuwe kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "New _Event"
+#~ msgstr "Nieuwe Ka_lender"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Open Kalender"
+
+#~ msgid "Prev"
+#~ msgstr "Vorige"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Kalender bewaren als iets anders"
+
+#~ msgid "Week"
+#~ msgstr "Week"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Open Ka_lender"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Markeer Als Gelezen"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Markeer Als _Ongelezen"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Bericht afdrukken naar de printer"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Omleiden (FIXME: implementeer mij)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Opslaan in _map... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Voeg tekstbestand _in... (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolutionbalk _snelkoppeling"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
+
+#~ msgid "Edit Task"
+#~ msgstr "Taak Bewerken"
 
 #~ msgid "Attendee address"
 #~ msgstr "Adres aanwezige"
@@ -9244,18 +12305,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "Annuleer\n"
 #~ "Bijeenkomst"
 
-#~ msgid "Chair"
-#~ msgstr "Voorzitter"
-
-#~ msgid "Meeting Invitations"
-#~ msgstr "Uitnodigingen voor de bijeenkomst"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Niet-Deelnemer"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Optionele Deelnemer"
-
 #~ msgid "Organizer: "
 #~ msgstr "Co�rdinator: "
 
@@ -9266,25 +12315,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "Publiceren\n"
 #~ "Gebeurtenis"
 
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
-#~ msgid "Required Participant"
-#~ msgstr "Vereiste Deelnemer"
-
-#~ msgid "Role"
-#~ msgstr "Rol"
-
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "Plan\n"
-#~ "Tijd"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Afspraak Bewerken"
-
 #~ msgid "Appointment Basics"
 #~ msgstr "Afspraak Basisgegevens:"
 
@@ -9361,9 +12391,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "%H:%M%n"
 #~ msgstr "%H:%M%n"
 
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "Kan het Samenvattingscomponent van Evolution niet initializeren"
-
 #~ msgid ""
 #~ "Cannot open the HTML file:\n"
 #~ "%s"
@@ -9396,9 +12423,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Send an email to %s"
 #~ msgstr "Verstuur een bericht naar %s"
 
-#~ msgid "Change the view to %s"
-#~ msgstr "Verander de weergave in %s"
-
 #~ msgid "Run %s"
 #~ msgstr "Start %s"
 
@@ -9439,12 +12463,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "waarschijnlijk aan dat u Bonobo gecompileerd hebt tegen GOAD in plaats van "
 #~ "OAF."
 
-#~ msgid "Evolution component for the executive summary."
-#~ msgstr "Evolution-component voor de samenvatting."
-
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "Fabriek voor het Evolution-samenvattingscomponent."
-
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Fabriek voor de RDF-samenvatting."
 
@@ -9466,12 +12484,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Update automatically"
 #~ msgstr "Actualiseer automatisch"
 
-#~ msgid "Update now"
-#~ msgstr "Actualiseer nu"
-
-#~ msgid "Update every "
-#~ msgstr "Actualiseer elke "
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -9481,18 +12493,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Onafgemaakt bericht naar pijp geschreven!"
 
-#~ msgid "Mail Summary"
-#~ msgstr "Samenvatting"
-
-#~ msgid "Flagged"
-#~ msgstr "Gevlagd"
-
-#~ msgid "Received"
-#~ msgstr "Ontvangen"
-
-#~ msgid "Size"
-#~ msgstr "Grootte"
-
 #~ msgid "About this application"
 #~ msgstr "Over deze applicatie"
 
@@ -9511,21 +12511,9 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Contro_leer Namen (FIXME)"
 
-#~ msgid "Clear"
-#~ msgstr "Wissen"
-
-#~ msgid "Clear the selection"
-#~ msgstr "Selectie wissen"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Deze afspraak sluiten"
-
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "Kopieer naar Map... (FIXME)"
 
-#~ msgid "Delete this appointment"
-#~ msgstr "Verwijder deze afspraak"
-
 #~ msgid "Dump XML"
 #~ msgstr "XML Dumpen"
 
@@ -9547,9 +12535,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "In_complete Task (FIXME)"
 #~ msgstr "On_voltooide Taak (FIXME)"
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "De bestandseigenschappen wijzigen"
-
 #~ msgid "N_ext"
 #~ msgstr "V_olgende"
 
@@ -9559,9 +12544,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Print S_etup..."
 #~ msgstr "Afdrukin_stellingen..."
 
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Bewaar de afspraak en sluit dit venster"
-
 #~ msgid "Schedule some sort of a meeting"
 #~ msgstr "Een bijeenkomst plannen"
 
@@ -9628,9 +12610,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Find"
 #~ msgstr "Zoek"
 
-#~ msgid "Find Again"
-#~ msgstr "Opnieuw Zoeken"
-
 #~ msgid "Meeting Re_quest (FIXME)"
 #~ msgstr "Ve_rzoek Bijeenkomst (FIXME)"
 
@@ -9655,9 +12634,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "S_kip Occurrence (FIXME)"
 #~ msgstr "Sla Gebeurtenis over (FIXME)"
 
-#~ msgid "Save the task and close the dialog box"
-#~ msgstr "Bewaar deze taak en sluit het dialoogvenster"
-
 #~ msgid "Search again for the same string"
 #~ msgstr "Probeer dezelfde tekenreeks nogmaals te vinden"
 
diff --git a/po/nn.po b/po/nn.po
index 7229692951..3a0077cfa9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-07-13 15:51+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -22,209 +22,209 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "mellombels feil i namneoppslag"
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 #, fuzzy
 msgid ""
 "\n"
@@ -241,25 +241,25 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "&Fleire spelarar"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Kort 1:"
@@ -269,9 +269,9 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -285,15 +285,15 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
@@ -375,7 +375,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr ""
 
@@ -410,13 +410,14 @@ msgstr ""
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Host:"
 msgstr "time/timar"
@@ -458,7 +459,7 @@ msgid "Advanced LDAP Options"
 msgstr "Avanserte kISDN-val"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Sti:"
 
@@ -471,38 +472,38 @@ msgstr ""
 msgid "Create path if it doesn't exist."
 msgstr "Fila finst ikkje\n"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:886
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Navn:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Skildring:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -526,26 +527,25 @@ msgid "URI"
 msgstr "URL"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:104 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/component/addressbook-storage.c:118
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Slett kolonne"
@@ -585,7 +585,7 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr ""
 
@@ -607,31 +607,22 @@ msgstr "Sp�rjinga inneheld"
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(ingen)"
-
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
@@ -664,7 +655,7 @@ msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Slett kolonne"
@@ -694,10 +685,13 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:618
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Fjern"
 
@@ -711,6 +705,15 @@ msgstr "Fjern"
 msgid "Send HTML Mail?"
 msgstr "&Send e-post"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Endra skrift"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
 msgid "Message Recipients"
@@ -738,163 +741,158 @@ msgid "_Search"
 msgstr "S�k"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Legg til"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "Anni_versary:"
 msgstr "Merkedag"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "B_usiness"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Business _Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detaljar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "File As:"
 msgstr "Arkiver som"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefontypar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Web page address:"
 msgstr "&WINS-adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Address..."
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "_Assistant's name:"
 msgstr "&Namn p� assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #, fuzzy
 msgid "_Birthday:"
 msgstr "F�dselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:20
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1196
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1290
-#: mail/mail-config.glade.h:103 ui/evolution-mail-message.xml.h:78
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Na_mn p� sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Rediger e-post-adresser"
@@ -904,102 +902,102 @@ msgstr "Rediger e-post-adresser"
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn p� assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Persons�kjar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
@@ -1014,7 +1012,7 @@ msgid "Edit Full"
 msgstr "Rediger fil"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Fullt namn"
@@ -1193,7 +1191,7 @@ msgid "Add Anyway"
 msgstr "Legg til &ny"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Duplicate Contact Detected"
 msgstr "Lag kopi av side"
@@ -1216,27 +1214,27 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Change Anyway"
-msgstr "Endra vinkel"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-#, fuzzy
 msgid "Changed Contact:"
 msgstr "Endra skrift"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 #, fuzzy
 msgid "Conflicting Contact:"
 msgstr "Koplar til: "
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Endra vinkel"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "S�k"
 
@@ -1388,9 +1386,9 @@ msgstr "Sender ei melding til ein nettverksspelar"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -1402,9 +1400,10 @@ msgstr "Private meldingar"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
@@ -1420,7 +1419,7 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1429,7 +1428,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -1485,147 +1484,147 @@ msgid "Error removing list"
 msgstr "Feil ved fjerning av oppsett"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "Trykk her for � leggja til ein ny virtuell vert."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Prim�r telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Hovudtelefon til firmaet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "Persons�kjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 #, fuzzy
 msgid "Removing cards..."
 msgstr "&Suspender ..."
@@ -1675,7 +1674,8 @@ msgid "Dimensions:"
 msgstr "Dimensjonar"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Skrifttype ..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1827,20 +1827,25 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Breidd:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Skrifttype ..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1882,6 +1887,11 @@ msgstr "�ydelagd oppsettfil."
 msgid "Factory for the sample Calendar control"
 msgstr "�ydelagd oppsettfil."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "�ydelagd oppsettfil."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr ""
@@ -2001,138 +2011,160 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:278
-msgid "File not found"
-msgstr "Fann ikkje fil"
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:302
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 #, fuzzy
-msgid "Open calendar"
-msgstr "Feil ved opning"
+msgid "%a %d %b %Y"
+msgstr "%1 bit %2 %3"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
 #, fuzzy
-msgid "Save calendar"
-msgstr "Ny kalender"
+msgid "%B %Y"
+msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:596
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:989
-#: calendar/gui/e-calendar-table.c:346
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:386 calendar/gui/calendar-model.c:991
-#: calendar/gui/e-calendar-table.c:347
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:389 calendar/gui/calendar-model.c:993
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:392 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:489
+#: calendar/gui/calendar-model.c:497
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:489
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:491
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:491
+#: calendar/gui/calendar-model.c:499
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 #, fuzzy
 msgid "High"
 msgstr "H�gd"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/calendar-model.c:1176
-#: calendar/gui/calendar-model.c:1699
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:533 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
 
-#: calendar/gui/calendar-model.c:569 calendar/gui/calendar-model.c:1230
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:572 calendar/gui/calendar-model.c:1232
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1284
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:403
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
-#: calendar/gui/calendar-model.c:729 calendar/gui/calendar-model.c:1286
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: calendar/gui/calendar-model.c:732 calendar/gui/calendar-model.c:1288
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:735 calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbroten"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:885 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:888 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:901
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2140,65 +2172,70 @@ msgid ""
 "%s"
 msgstr "Ein bandindeks m� vera valt i treet."
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:987 calendar/gui/calendar-model.c:1228
-#: calendar/gui/calendar-model.c:1282
-#: calendar/gui/dialogs/e-timezone-dialog.c:197
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
-#: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
-#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
-#: shell/e-shell-view.c:1406 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
-#: widgets/misc/e-dateedit.c:1484
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1078
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1118
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1159
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1213
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "&No"
@@ -2287,7 +2324,7 @@ msgstr "Terminalprogram:"
 msgid "With these arguments:"
 msgstr "K�yr %s med desse arguenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 #, fuzzy
 msgid "days"
 msgstr " dag"
@@ -2297,12 +2334,12 @@ msgstr " dag"
 msgid "extra times every"
 msgstr "Oppdater kvart"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 #, fuzzy
 msgid "hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutt"
 
@@ -2408,7 +2445,7 @@ msgstr "KBasic"
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:297
+#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Dato/tid"
@@ -2422,7 +2459,7 @@ msgstr "P�minning:"
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:286 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -2457,7 +2494,7 @@ msgstr "&Slett avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutt"
@@ -2506,8 +2543,7 @@ msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1014
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 #, fuzzy
 msgid "Calendar"
 msgstr "Skriv ut alle"
@@ -2546,7 +2582,7 @@ msgid "Defaults"
 msgstr "Standard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Display"
 msgstr "Vis"
@@ -2565,7 +2601,7 @@ msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
 msgid "Friday"
 msgstr "Fredag"
@@ -2575,7 +2611,7 @@ msgid "Mon"
 msgstr "M�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "M�ndag"
 
@@ -2599,7 +2635,7 @@ msgid "Sat"
 msgstr "Lau"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
@@ -2624,7 +2660,7 @@ msgid "Sun"
 msgstr "Sun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sundag"
 
@@ -2643,7 +2679,7 @@ msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:977
+#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
@@ -2672,7 +2708,7 @@ msgid "Tue"
 msgstr "Tys"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
 msgid "Tuesday"
 msgstr "Tysdag"
@@ -2682,7 +2718,7 @@ msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:976
+#: calendar/gui/dialogs/recurrence-page.c:967
 #, fuzzy
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -2766,31 +2802,31 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:582 calendar/gui/print.c:2115
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 #, fuzzy
 msgid " to "
 msgstr " til:"
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:586 calendar/gui/print.c:2119
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:588 calendar/gui/print.c:2121
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:593 calendar/gui/print.c:2126
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:595 calendar/gui/print.c:2128
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
@@ -2820,13 +2856,13 @@ msgstr ""
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1462
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1466
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 #, fuzzy
 msgid ""
@@ -2835,7 +2871,7 @@ msgid ""
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
@@ -2981,12 +3017,136 @@ msgstr "Slutt-tid:"
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:614
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenamn:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kjelder"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Teikn"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Vel ikon"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Slett"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Mellombels"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Slett"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Framgong:"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Bil-telefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
 msgid "Sent By:"
 msgstr "Sende byte"
 
-#: calendar/gui/dialogs/meeting-page.c:1191
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "F&jern rad ..."
@@ -3029,14 +3189,14 @@ msgid "Role"
 msgstr "Mobil:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Status"
 msgstr "Status:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:96
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -3064,36 +3224,36 @@ msgstr "Andre ..."
 msgid "_Other Organizer"
 msgstr "Planleggjar"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:947
+#: calendar/gui/dialogs/recurrence-page.c:938
 #, fuzzy
 msgid "on"
 msgstr "M�n"
 
-#: calendar/gui/dialogs/recurrence-page.c:973 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dagen"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "on the"
 msgstr "M�nad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1111
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1281
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3201,7 +3361,7 @@ msgid "No one"
 msgstr "Ingen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:894
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -3240,109 +3400,110 @@ msgstr "Prioritet:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:390
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:391
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:393
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:886
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "Edit this task"
-msgstr "&Endra avtale ..."
+msgid "_Open"
+msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:887 calendar/gui/e-calendar-table.c:897
-#: calendar/gui/e-day-view.c:3332 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "C_ut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:888 calendar/gui/e-calendar-table.c:898
-#: calendar/gui/e-day-view.c:3334 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:889 calendar/gui/e-calendar-table.c:899
-#: calendar/gui/e-day-view.c:3307 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3146 calendar/gui/e-week-view.c:3174
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:891
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Mark as complete"
+msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:892
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Delete this task"
+msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:901
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Mark tasks as complete"
+msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:902 ui/evolution-tasks.xml.h:6
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
-msgid "Delete selected tasks"
+msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppg�va"
 
-#: calendar/gui/e-calendar-table.c:1259
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Trykk her for � leggja til ein ny virtuell vert."
@@ -3362,8 +3523,8 @@ msgstr "Alarm"
 msgid "Categories"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:696
-#: camel/camel-filter-driver.c:808
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
@@ -3427,13 +3588,6 @@ msgstr ""
 msgid "%A %d %B"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-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:1357
@@ -3454,152 +3608,146 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3312 ui/evolution-calendar.xml.h:21
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "New Appointment"
+msgid "New _Appointment"
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3153
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "New All Day Event"
+msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3319 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "G� til &i dag"
 
-#: calendar/gui/e-day-view.c:3321 calendar/gui/e-week-view.c:3160
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "&G� til side ..."
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3166
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3168
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 #, fuzzy
-msgid "Delete this Appointment"
+msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3345 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3347 calendar/gui/e-week-view.c:3190
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Erstatt denne f�rekomsten?"
 
-#: calendar/gui/e-day-view.c:3349
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
+msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "This is an event that can be added to your calendar."
 msgstr "Dette er ei topptekstramme - ho kan ikkje slettast."
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
 msgid "This is a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "This is one or more additions to a current meeting."
 msgstr ""
 "Dette er f�rste niv�\n"
 "i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy
 msgid "This is a request for the latest event information."
 msgstr "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "This is a reply to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:709
 #, fuzzy
 msgid "This is an event cancellation."
 msgstr ""
 "Dette er det siste niv�et\n"
 "i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:667 calendar/gui/e-itip-control.c:707
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "The message is not understandable."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:740
 #, fuzzy
 msgid "This is a task request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "This is a request for the latest task information."
 msgstr "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:746
 #, fuzzy
 msgid "This is a reply to a task request."
 msgstr ""
 "Dette er ein katalog og inga fil:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:704
+#: calendar/gui/e-itip-control.c:749
 #, fuzzy
 msgid "This is an task cancellation."
 msgstr "Dette er inga lokal fil.\n"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:771
 #, fuzzy
 msgid "This is freebusy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:774
 #, fuzzy
 msgid "This is a request for freebusy information."
 msgstr "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:792
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:989
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:1015
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3647,22 +3795,22 @@ msgstr ""
 msgid "date-start"
 msgstr " start"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 #, fuzzy
 msgid "Category:"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
@@ -3676,37 +3824,12 @@ msgstr "Metoden %1 er ikkje st�tta."
 msgid "%d %B"
 msgstr "%1 %2"
 
-#: calendar/gui/e-week-view.c:3151 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "New Appointment..."
+msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-week-view.c:3192
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Slettar klassen"
-
-#: calendar/gui/gnome-cal.c:219
-#, fuzzy
-msgid "Summary contains"
-msgstr "Sp�rjinga inneheld"
-
-#: calendar/gui/gnome-cal.c:220
-#, fuzzy
-msgid "Description contains"
-msgstr "Skildringar"
-
-#: calendar/gui/gnome-cal.c:221
-#, fuzzy
-msgid "Comment contains"
-msgstr "ikkje inneheld"
-
-#: calendar/gui/gnome-cal.c:222
-#, fuzzy
-msgid "Has category"
-msgstr "Kategori"
-
-#: calendar/gui/gnome-cal.c:1058
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -3714,7 +3837,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1069
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
@@ -3789,7 +3912,7 @@ msgstr "September"
 msgid "_Go To Today"
 msgstr "G� til &i dag"
 
-#: calendar/gui/itip-utils.c:223
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3952,15 +4075,15 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:156
-#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppg�ver"
 
 #. Day
 #: calendar/gui/print.c:1815
-msgid "Current day (%a %b %d %Y)"
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
@@ -3973,45 +4096,45 @@ msgstr ""
 
 #: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
 #: calendar/gui/print.c:1854
 #, fuzzy
-msgid "Current month (%b %Y)"
+msgid "Selected month (%b %Y)"
 msgstr "Denne m�naden"
 
 #. Year
 #: calendar/gui/print.c:1861
 #, fuzzy
-msgid "Current year (%Y)"
+msgid "Selected year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:2199
+#: calendar/gui/print.c:2200
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:2287 calendar/gui/print.c:2379
-#: mail/mail-callbacks.c:1820 my-evolution/e-summary.c:498
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 #, fuzzy
 msgid "Print Preview"
 msgstr "&F�rehandsvising ..."
 
-#: calendar/gui/print.c:2316
+#: calendar/gui/print.c:2317
 #, fuzzy
 msgid "Print Item"
 msgstr "Utskriftssystem"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2398
 #, fuzzy
 msgid "Print Setup"
 msgstr "Speloppsett"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
@@ -4099,59 +4222,59 @@ msgstr "Registrerer hj� tenaren ..."
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:530 camel/camel-filter-driver.c:539
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:641
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:650
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:664
-#, fuzzy, c-format
+#: camel/camel-filter-driver.c:667
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:668 camel/camel-filter-driver.c:681
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Kan ikkje dekryptera melding:"
 
-#: camel/camel-filter-driver.c:692 camel/camel-filter-driver.c:803
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:762
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:785
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:885
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:891
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -4388,7 +4511,7 @@ msgid "Connection cancelled"
 msgstr "Avbroten."
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4397,14 +4520,14 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Feil ved opning"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -4502,7 +4625,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -4573,7 +4696,7 @@ msgstr ""
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4621,13 +4744,6 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to verify certificates."
 msgstr "�tvaring ved &tilbaketrekte sertifikat"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
-#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
-#, fuzzy
-msgid "Trash"
-msgstr "Oppg�ve"
-
 #: camel/camel-tcp-stream-openssl.c:415
 #, fuzzy, c-format
 msgid ""
@@ -4681,26 +4797,26 @@ msgstr "Vidaresendt melding"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post fr� tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:493
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:530
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -4721,18 +4837,29 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:430
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Leitar etter tilleggsmodular"
+msgid "Scanning for changed messages"
+msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1819
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1852
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Melding"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4743,7 +4870,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Berre sjekk for ny e-post."
@@ -4753,7 +4880,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:646
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4787,28 +4914,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4816,11 +4943,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
@@ -5103,7 +5234,7 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1468
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synkroniser"
@@ -5165,7 +5296,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1106
 #, fuzzy, c-format
@@ -5364,7 +5495,7 @@ msgstr "&La e-posten liggja p� tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -5444,7 +5575,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -5498,7 +5629,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:76
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -5506,127 +5637,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Skjul"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5634,114 +5765,129 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Sen melding"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "M�te"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5772,7 +5918,7 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
@@ -5811,7 +5957,7 @@ msgstr "MIME-type"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:325
+#: composer/e-msg-composer-hdrs.c:328
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -5819,14 +5965,14 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Fr�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Svar"
@@ -5834,34 +5980,34 @@ msgstr "Svar"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:391
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5892,67 +6038,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 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:1043
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5961,18 +6107,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1321
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -5982,20 +6123,25 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1854 composer/e-msg-composer.c:2242
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2336
+#: composer/e-msg-composer.c:2351
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -6026,75 +6172,59 @@ msgstr "Adresse"
 msgid "calendar information"
 msgstr "Informasjon"
 
-#: default_user/searches.xml.h:1
-#, fuzzy
-msgid "Body contains"
-msgstr "Handlingar"
-
-#: default_user/searches.xml.h:2
-#, fuzzy
-msgid "Body does not contain"
-msgstr "ikkje inneheld"
-
-#: default_user/searches.xml.h:3
-#, fuzzy
-msgid "Body or subject contains"
-msgstr "Emne"
-
-#: default_user/searches.xml.h:4
-#, fuzzy
-msgid "Sender contains"
-msgstr "Sp�rjinga inneheld"
-
-#: default_user/searches.xml.h:5
-#, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
-
-#: default_user/searches.xml.h:6
-#, fuzzy
-msgid "Subject does not contain"
-msgstr "Emne"
-
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%H:%M"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "Tx"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -6102,88 +6232,88 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%H:%M"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "year"
 msgstr "�r"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "�r"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "M�nad"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "m�nad(er)"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "week"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "hour"
 msgstr "time/timar"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 #, fuzzy
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -6191,37 +6321,42 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 #, fuzzy
 msgid "the current time"
 msgstr "tid no"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 #, fuzzy
 msgid "a time relative to the current time"
 msgstr "Vis hendingane for denne dagen"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 #, fuzzy
 msgid "Compare against"
 msgstr "Kompilator�tvaringar"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 #, fuzzy
 msgid "now"
 msgstr "nei"
 
-#: filter/filter-datespec.c:579
+#: filter/filter-datespec.c:575
 #, fuzzy
 msgid " ago"
 msgstr "Tag"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:621
+#, fuzzy
+msgid "ago"
+msgstr "Tag"
+
+#: filter/filter-datespec.c:709
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Trykk for � velja ein skrifttype"
@@ -6248,8 +6383,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:766
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -6319,7 +6454,14 @@ msgstr "Koding"
 msgid "outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Legg til"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Rediger"
 
@@ -6461,141 +6603,136 @@ msgid "Expression"
 msgstr "&Yrke:"
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 #, fuzzy
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "E-post&liste for spr�ket:"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Message Body"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Message was received"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Message was sent"
 msgstr "Lag meldingar og sl� saman"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "on or after"
 msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "Tilfeldig"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Recipients"
 msgstr "Nyleg brukte fargar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "Svar til alle:"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "Send"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Status:"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Storleik (KB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:861
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "was after"
 msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
@@ -6618,15 +6755,19 @@ msgstr "Rediger fil"
 msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:764 importers/pine-importer.c:627
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:769
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:12
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Mail"
 msgstr "Send"
@@ -6652,11 +6793,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:774
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:799
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6717,26 +6858,40 @@ msgstr "�ydelagd oppsettfil."
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:679
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Eigenskapar ..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Endra namnet p� spelarane"
+
+#: mail/component-factory.c:757
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:813
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:253
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser-ui.c:255
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -6744,152 +6899,152 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Vel mappe"
 
-#: mail/folder-browser.c:1224
+#: mail/folder-browser.c:1238
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1241
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1244
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1247
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1239
+#: mail/folder-browser.c:1253
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1256
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1259
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1262
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1257
-#, fuzzy
-msgid "_Open"
-msgstr "Opna ..."
-
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "Svar"
 
-#: mail/folder-browser.c:1261 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "_Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:1263 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:1268 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:1270 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til:"
 
-#: mail/folder-browser.c:1272 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1288
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1279
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1281
+#: mail/folder-browser.c:1295
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1286
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marker som lesen"
+
+#: mail/folder-browser.c:1302
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: mail/folder-browser.c:1292 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1322
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1479
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1480
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Fil alt i liste"
@@ -6964,12 +7119,12 @@ msgstr "KDeelop-installering"
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
-#: mail/mail-account-gui.c:956
+#: mail/mail-account-gui.c:971
 #, fuzzy
 msgid "Save signature"
 msgstr "Vis sig&natur"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:977
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6979,31 +7134,40 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Standard"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "p�"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Slett"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:716
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
@@ -7079,87 +7243,87 @@ msgstr ""
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, fuzzy, c-format
 msgid "On %s, %s wrote:"
 msgstr "%D, skreiv %F:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding fr� %1"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1339
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1396
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1395
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1442
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:1428
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Ingen rektangel valt!"
 
-#: mail/mail-callbacks.c:1510
+#: mail/mail-callbacks.c:1545
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1512
+#: mail/mail-callbacks.c:1547
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1722
+#: mail/mail-callbacks.c:1766
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:1732
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1827
+#: mail/mail-callbacks.c:1871
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-callbacks.c:1922
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil sletta denne overf�ringa?"
@@ -7195,11 +7359,11 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:463
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.c:1583 mail/mail-config.c:1586
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -7216,64 +7380,69 @@ msgstr "farge"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
 msgid "Account"
 msgstr "Sm� ikon"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Certificate ID:"
 msgstr "Dine SSL-sertifikat"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Ny melding"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7283,304 +7452,326 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Default \"Forward\" style is: "
+msgid "Default Forward style is: "
 msgstr "Fjern ramme"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Default character set: "
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Detaljar ..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Kladd"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Endra ..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Empty trash folders on exit"
 msgstr "T�m papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "p�"
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Highlight citations with"
 msgstr "Merkingsvilk�r"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "&IMAP 4"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Inline"
 msgstr "Vinkel"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after"
+msgid "Mark messages as Read after"
 msgstr "Lag meldingar og sl� saman"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Ny ..."
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Personleg informasjon"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Prompt when sending messages with an empty subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Sender meldingar til %1"
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "E-post 2"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for oppkopling p� nytt"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Secure MIME"
 msgstr "Er sikker"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Source"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Mapper"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardfil"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "newswindow1"
 msgstr "Nytt vindauge"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "placeholder"
 msgstr "Bruk &plasshaldarar"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
@@ -7630,41 +7821,41 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:1047
+#: mail/mail-display.c:1048
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
@@ -7685,168 +7876,160 @@ msgstr "Lagrar fil ..."
 
 #: mail/mail-display.c:1410
 #, fuzzy
-msgid "Save Image as"
+msgid "Save Image as..."
 msgstr "Lagra bilete som"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:170 mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:171
+#: mail/mail-folder-cache.c:177
 #, fuzzy, c-format
 msgid "%d hidden"
 msgstr "g�ymt"
 
-#: mail/mail-folder-cache.c:178
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "Legg til &ny"
+
+#: mail/mail-folder-cache.c:188
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "(%1 totalt)"
 
-#: mail/mail-format.c:603
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:734 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 #, fuzzy
 msgid "Date"
 msgstr "Forfallsdato"
 
-#: mail/mail-format.c:850 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-post-adresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Fr�"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:867
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar"
 
-#: mail/mail-format.c:856 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:859
+#: mail/mail-format.c:873
 #, fuzzy
 msgid "Cc"
 msgstr "&CC:"
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: mail/mail-format.c:1197
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:1204
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1260
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1268
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1920
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1932
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1936
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1970
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1975
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Opnar URL ..."
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:856
-#, fuzzy
-msgid "Creating new folder"
-msgstr "Lagar ei ny mappe"
-
-#: mail/mail-local.c:870
-#, fuzzy
-msgid "Copying messages"
-msgstr "Melding"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+
+#: mail/mail-local.c:1011
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Set opp %1"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7855,7 +8038,7 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7864,132 +8047,118 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "Flyttar"
 
-#: mail/mail-mt.c:867
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Oppl�ysing"
-
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:578
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:560
-#, fuzzy
-msgid "Sending message"
-msgstr "Sen melding"
-
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "Ferdig"
 
-#: mail/mail-ops.c:783
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1016
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1141
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Oppg�ve"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding fr� %1"
 
-#: mail/mail-ops.c:1182 mail/mail-ops.c:1320
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1249
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1388
+#: mail/mail-ops.c:1436
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1568
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1604
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:1672
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Mottek meldingar fr� %1"
-
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1722
 #, fuzzy, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgid "Retrieving %d message(s)"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:1756
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1848
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar fr� %1"
-
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7998,24 +8167,24 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2032
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2101
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar fr� ..."
@@ -8025,25 +8194,35 @@ msgstr "Koplar fr� ..."
 msgid "(Untitled Message)"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Ulest melding"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Legg til melding"
+
+#: mail/mail-search.c:284
 #, fuzzy
 msgid "Find in Message"
 msgstr "&Finn i melding ..."
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Skil mellom store og sm� bokstavar"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 #, fuzzy
 msgid "Search Forward"
 msgstr "30 sekund framover"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 #, fuzzy
 msgid "Matches:"
 msgstr "Treff:"
@@ -8083,14 +8262,14 @@ msgstr "Sender %1"
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 #, fuzzy
 msgid "User canceled operation."
 msgstr ""
 "Brukaren avbraut handling\n"
 "%1"
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, fuzzy, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
@@ -8098,38 +8277,27 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-tools.c:207
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Vidaresendt melding"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (ingen emne)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding fr� %1"
 
-#: mail/mail-tools.c:236
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "Vidaresendt melding fr� %1"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Vidaresendt melding fr� %1"
 
-#: mail/mail-vfolder.c:250
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:442
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
@@ -8205,11 +8373,16 @@ msgstr "%H:%M"
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Melding"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Motta"
@@ -8288,70 +8461,76 @@ msgstr "%H:%M"
 msgid "%a %l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-mail.c:103
+#: my-evolution/e-summary-mail.c:104
 #, fuzzy
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:874
+#: my-evolution/e-summary-preferences.c:869
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppf�ring"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:877
 #, 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-rdf.c:387 my-evolution/e-summary-rdf.c:413
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Skriftinnstillingar"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 #, fuzzy
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: my-evolution/e-summary-tasks.c:157
+#: my-evolution/e-summary-tasks.c:206
 #, fuzzy
 msgid "No tasks"
 msgstr "Ingen oppg�ver ..."
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-weather.c:57
 #, fuzzy
 msgid "My Weather"
 msgstr "Vatn"
 
-#: my-evolution/e-summary-weather.c:304
-#, fuzzy
-msgid "<b>Error downloading Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
 
-#: my-evolution/e-summary-weather.c:628
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
 msgid "Regions"
 msgstr "Start om att"
 
-#: my-evolution/e-summary.c:144
+#: my-evolution/e-summary.c:145
 #, fuzzy
 msgid "%A, %d %B %Y"
 msgstr "%1 bit %2 %3"
 
-#: my-evolution/e-summary.c:459 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print My Evolution"
 msgstr "Evolution"
 
-#: my-evolution/e-summary.c:505
+#: my-evolution/e-summary.c:518
 #, fuzzy
 msgid "Printing of My Evolution failed"
 msgstr "Feil ved skriving av band-ID."
@@ -8361,44 +8540,6 @@ msgstr "Feil ved skriving av band-ID."
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: my-evolution/metar.c:29
-#, fuzzy
-msgid "�F"
-msgstr "�"
-
-#: my-evolution/metar.c:29
-#, fuzzy
-msgid "�C"
-msgstr "�"
-
-#: my-evolution/metar.c:33
-#, fuzzy
-msgid "knots"
-msgstr "Knop"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr ""
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "inHg"
-msgstr "&Linje"
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "mmHg"
-msgstr "mm"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "miles"
-
-#: my-evolution/metar.c:41
-#, fuzzy
-msgid "kilometers"
-msgstr "meter"
-
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9716,144 +9857,129 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add ->"
-msgstr "&Legg til >>"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add new feed"
 msgstr "Legg til nytt bilete"
 
-#: my-evolution/my-evolution.glade.h:3
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "All folders:"
 msgstr "Alle kantar"
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 #, fuzzy
 msgid "All news feeds:"
 msgstr "&Alle felt"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "All stations:"
 msgstr "&Tilgjengelege handlingar:"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "Display folders:"
 msgstr "Skjermkontrollerarar"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "Display stations:"
 msgstr "Visingsval:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "Displayed feeds:"
 msgstr "Vist namn:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "Five days"
 msgstr " dagar"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Max number of items shown:"
 msgstr "&H�gste tal p� hopp:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Nettverksinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "News Feeds"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "One day"
 msgstr " dag"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "One month"
 msgstr "Neste m�nad"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "One week"
 msgstr "Veke"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "Refresh time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Remove <-"
-msgstr "Fjern"
-
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Schedule"
 msgstr "&Plan"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "Show all tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "Show full path for folders"
 msgstr "Vis sidekantar"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "Show today's tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "Tasks "
 msgstr "Oppg�ver"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "Units: "
 msgstr "Einingar"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "Weather"
 msgstr "Vatn"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "Weather settings"
 msgstr "Toppinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:29
-#, fuzzy
-msgid "Wipe trackers"
-msgstr "Tr�dmodell"
-
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "imperial"
 msgstr "seriell"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:28
 #, fuzzy
 msgid "metric"
 msgstr "Geometrisk"
@@ -9873,6 +9999,11 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "&Avbryt operasjon"
 
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Mapper"
+
 #: shell/e-setup.c:125 shell/e-setup.c:196
 #, fuzzy
 msgid "Evolution installation"
@@ -9996,7 +10127,7 @@ msgstr "Er du sikker p� at du vil sletta denne mappa?"
 msgid "Rename folder '%s'"
 msgstr "Endra namn p� profil '%1'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -10005,12 +10136,12 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy
 msgid "The specified folder name is not valid."
 msgstr "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "Lagar ei ny mappe"
@@ -10021,11 +10152,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
@@ -10172,43 +10303,44 @@ msgstr "Vel katalogen som inneheld tenestene"
 
 #: shell/e-shell-view-menu.c:689
 #, fuzzy
-msgid "Work online"
+msgid "Work Online"
 msgstr "Flyttar"
 
 #: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
 #, fuzzy
-msgid "Work offline"
+msgid "Work Offline"
 msgstr "Flyttar"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1395 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 #, fuzzy
 msgid "My Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1412
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1414
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1452
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1458
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1465
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
@@ -10217,7 +10349,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1310
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -10245,190 +10377,195 @@ msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "Sm� ikon"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsn�ggtastar"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Endra portnamn"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "&Merka tekst"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "Opna ..."
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 #, fuzzy
 msgid "Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Omd�yp"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:614
+#: shell/e-shortcuts.c:585
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-shortcuts.c:1011
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-shortcuts.c:1013
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-shortcuts.c:1016
+#: shell/e-shortcuts.c:987
 #, fuzzy
 msgid "Contacts"
 msgstr "&Innhald ..."
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip � senda."
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje st�tta p� tenar"
 
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:172
-#, fuzzy, c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
@@ -10506,7 +10643,7 @@ msgstr "Ikkje sp�r igjen"
 msgid "Evolution has found the following data sources:"
 msgstr "Bruk p� f�lgjande delar:"
 
-#: shell/main.c:89
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10523,38 +10660,37 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:110
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:148
+#: shell/main.c:155
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:208
+#: shell/main.c:215
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:209
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:244
+#: shell/main.c:255
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "C_ut"
-msgstr "Klipp ut"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopier"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Slettar den valte fila"
@@ -10569,7 +10705,11 @@ msgstr "Lagar eit nytt dokument"
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Slettar den valte fila"
@@ -10589,7 +10729,11 @@ msgstr "Se&nd avtale"
 msgid "New list"
 msgstr "Ny liste"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
@@ -10639,19 +10783,7 @@ msgstr "&Innhald ..."
 msgid "_Contact Group"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-#, fuzzy
-msgid "_Copy"
-msgstr "Kopier"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-#, fuzzy
-msgid "_Paste"
-msgstr "Lim inn"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
@@ -10666,199 +10798,140 @@ msgstr ""
 msgid "_Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Tools"
 msgstr "Verkt�y"
 
-#: ui/evolution-calendar.xml.h:1
-#, fuzzy
-msgid "5 Days"
-msgstr " dag"
-
 #: ui/evolution-calendar.xml.h:2
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Innstillingar"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Feil ved opning"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new calendar"
-msgstr "Feil ved opning"
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dag"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "G� til side"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go back in time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Fram"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "G� til side"
 
-#: ui/evolution-calendar.xml.h:17
-#, fuzzy
-msgid "Go to _Today"
-msgstr "G� til &i dag"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "G� til side"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "M�nad"
-
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "New _Event"
-msgstr "Ny &hending ..."
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-#, fuzzy
-msgid "Next"
-msgstr "Neste"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Open Calendar"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Prev"
-msgstr "F�rehandsvising:"
+msgid "New Appointment"
+msgstr "&Vis avtale ..."
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-#, fuzzy
-msgid "Save As"
-msgstr "Lagra"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:38
-#, fuzzy
-msgid "Settings..."
-msgstr "Skriftinnstillingar"
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Show 1 day"
 msgstr "Vis dato"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Show 1 month"
 msgstr "Vis metodar"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Show 1 week"
 msgstr "Vis %1"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-#, fuzzy
-msgid "Today"
-msgstr "i dag"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "&Arbeidsveke"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Veke"
-
-#: ui/evolution-calendar.xml.h:46
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Avtale"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Skriftinnstillingar"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "M�nad"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-#, fuzzy
-msgid "_New"
-msgstr "Vis"
-
-#: ui/evolution-calendar.xml.h:51
-#, fuzzy
-msgid "_Open Calendar"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Week"
 msgstr "Veke"
@@ -10892,7 +10965,7 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Sen melding"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "&F�rehandsvising ..."
@@ -10936,22 +11009,16 @@ msgstr ""
 msgid "_Action"
 msgstr "Handlingar"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Help"
-msgstr "Heim"
-
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
@@ -10975,7 +11042,7 @@ msgstr "Private meldingar"
 
 #: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
@@ -11091,88 +11158,93 @@ msgid "Compose"
 msgstr "Lukk"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Lukk melding"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
 msgid "Empty _Trash"
 msgstr " dag"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Skildring:"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Mottakar"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Filters..."
 msgstr "E-post:"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Legg til melding"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "F�rehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Mottakar"
@@ -11204,7 +11276,7 @@ msgstr "Neste melding"
 
 #: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Hide _Read messages"
+msgid "Hide _Read Messages"
 msgstr "Vidaresendt melding fr� %1"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -11406,22 +11478,22 @@ msgstr "Vis det f�rre dokumentet"
 
 #: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Filter on Mailing _List"
+msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
 #: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
 #: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
 #: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -11472,208 +11544,244 @@ msgstr "Sentrer dei valte elementa"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Load _Images"
 msgstr "Endra &biletestorleik"
 
-#: ui/evolution-mail-message.xml.h:39
-#, fuzzy
-msgid "Mar_k As Read"
-msgstr "Mar&ker som ulesen"
-
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As I_mportant"
-msgstr "Mar&ker som ulesen"
+msgid "Mark as I_mportant"
+msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "Mar&ker som ulesen"
+msgid "Mark as Unimp_ortant"
+msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Move"
 msgstr "M�n"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+#, fuzzy
+msgid "Next"
+msgstr "Neste"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Vis informasjonsmelding"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Legg til melding"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Vel mappe"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Ulest melding"
+
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Kopierer det merkte omr�det til utklippstavla"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "F�rre"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Vis det f�rre dokumentet"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Private meldingar"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Vis det f�rre dokumentet"
+
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Message..."
 msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Print Preview..."
 msgstr "&F�rehandsvising ..."
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Print message to the printer"
-msgstr "Sen melding"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+msgid "Print this message"
+msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "S_earch Message"
 msgstr "S�k i &meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen p� ruta her."
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "E-posttenar"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Vis &heile meldingshovudet"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Lag meldingar og sl� saman"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Rediger fil"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Endra tidsvising"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send melding"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Re-send Message"
 msgstr "Send melding"
@@ -11697,7 +11805,7 @@ msgid "Customize toolbars"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -11745,174 +11853,179 @@ msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
 #, fuzzy
+msgid "Inline Text _File..."
+msgstr "Sett inn fil ..."
+
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 #, fuzzy
 msgid "Insert text file..."
 msgstr "Sett inn fil ..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "Opna fil"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "S/MIME Encrypt"
 msgstr "&Krypter"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Lagra"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "Lagra"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Lagrar fil ..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "Save the current file"
 msgstr "tid no"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Send &seinare"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Send &seinare"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Send meldingar:"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Sen melding"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Sen melding"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Vedlegg som ikon"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Sender meldingar til %1"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sender meldingar til %1"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 #, fuzzy
-msgid "_Attachment"
+msgid "_Attachment..."
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "Slett alt"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "_Insert"
 msgstr "Set inn"
 
-#: ui/evolution-message-composer.xml.h:51
-#, fuzzy
-msgid "_Insert text file..."
-msgstr "Sett inn fil ..."
-
 #: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
@@ -11927,6 +12040,11 @@ msgstr "Svar"
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "Heim"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -11973,48 +12091,47 @@ msgid "Re_fresh Task"
 msgstr "Frisk opp lerret"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Create a new task"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Slett den valte oppg�va"
 
 #: ui/evolution-tasks.xml.h:7
 #, fuzzy
+msgid "Delete selected tasks"
+msgstr "Slett den valte oppg�va"
+
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
 msgid "New Task"
 msgstr "Oppg�ve"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppg�ve eller variabel fr� utklippstavla."
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Set task view preferences"
-msgstr "kView-innstillingar"
-
-#: ui/evolution-tasks.xml.h:12
-#, fuzzy
-msgid "Tasks Preferences..."
-msgstr "Innstillingar"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "TasksPreferences"
-msgstr "Innstillingar"
+msgid "Tasks Settings"
+msgstr "Skriftinnstillingar"
 
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
@@ -12161,11 +12278,6 @@ msgstr "Skriv ut alle"
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution.xml.h:38
-#, fuzzy
-msgid "Work Offline"
-msgstr "Flyttar"
-
 #: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_About Evolution..."
@@ -12216,6 +12328,11 @@ msgstr "Legg til melding"
 msgid "_Move..."
 msgstr "&Flytt ..."
 
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_New"
+msgstr "Vis"
+
 #: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
@@ -12301,10 +12418,6 @@ msgstr "Kategori"
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Mellombels"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Oppteke"
@@ -12401,21 +12514,20 @@ msgstr "Detaljert oversikt"
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-#, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#, fuzzy
+msgid "Today"
+msgstr "i dag"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
@@ -12509,21 +12621,26 @@ msgstr "Datakoding"
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Comment=X-redigering"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "S�k"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Legg til ..."
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
@@ -12590,3 +12707,229 @@ msgstr "Kunne ikkje initiere Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "kView-innstillingar"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Innstillingar"
+
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "File not found"
+#~ msgstr "Fann ikkje fil"
+
+#, fuzzy
+#~ msgid "Open calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Save calendar"
+#~ msgstr "Ny kalender"
+
+#, fuzzy
+#~ msgid "Edit this task"
+#~ msgstr "&Endra avtale ..."
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "G� til &i dag"
+
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Slettar klassen"
+
+#, fuzzy
+#~ msgid "Summary contains"
+#~ msgstr "Sp�rjinga inneheld"
+
+#, fuzzy
+#~ msgid "Description contains"
+#~ msgstr "Skildringar"
+
+#, fuzzy
+#~ msgid "Comment contains"
+#~ msgstr "ikkje inneheld"
+
+#, fuzzy
+#~ msgid "Has category"
+#~ msgstr "Kategori"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Leitar etter tilleggsmodular"
+
+#, fuzzy
+#~ msgid "Body contains"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "Body does not contain"
+#~ msgstr "ikkje inneheld"
+
+#, fuzzy
+#~ msgid "Body or subject contains"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Sender contains"
+#~ msgstr "Sp�rjinga inneheld"
+
+#, fuzzy
+#~ msgid "Subject contains"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Forward to Address"
+#~ msgstr "Vidaresendt melding"
+
+#, fuzzy
+#~ msgid "Creating new folder"
+#~ msgstr "Lagar ei ny mappe"
+
+#, fuzzy
+#~ msgid "Copying messages"
+#~ msgstr "Melding"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Oppl�ysing"
+
+#, fuzzy
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar fr� %1"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar fr� %1"
+
+#, fuzzy
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "Vidaresendt melding"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (ingen emne)"
+
+#, fuzzy
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Vidaresendt melding fr� %1"
+
+#, fuzzy
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr ""
+#~ "Feil ved nedlasting av fil:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "�F"
+#~ msgstr "�"
+
+#, fuzzy
+#~ msgid "�C"
+#~ msgstr "�"
+
+#, fuzzy
+#~ msgid "knots"
+#~ msgstr "Knop"
+
+#, fuzzy
+#~ msgid "inHg"
+#~ msgstr "&Linje"
+
+#, fuzzy
+#~ msgid "mmHg"
+#~ msgstr "mm"
+
+#~ msgid "miles"
+#~ msgstr "miles"
+
+#, fuzzy
+#~ msgid "kilometers"
+#~ msgstr "meter"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "&Legg til >>"
+
+#, fuzzy
+#~ msgid "Remove <-"
+#~ msgstr "Fjern"
+
+#, fuzzy
+#~ msgid "Wipe trackers"
+#~ msgstr "Tr�dmodell"
+
+#, fuzzy
+#~ msgid "Work offline"
+#~ msgstr "Flyttar"
+
+#, fuzzy
+#~ msgid "5 Days"
+#~ msgstr " dag"
+
+#, fuzzy
+#~ msgid "Alter preferences"
+#~ msgstr "Innstillingar"
+
+#, fuzzy
+#~ msgid "Create a new calendar"
+#~ msgstr "Feil ved opning"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Month"
+#~ msgstr "M�nad"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Ny &hending ..."
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Prev"
+#~ msgstr "F�rehandsvising:"
+
+#, fuzzy
+#~ msgid "Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#~ msgid "Week"
+#~ msgstr "Veke"
+
+#, fuzzy
+#~ msgid "_Open Calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Print message to the printer"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "_Insert text file..."
+#~ msgstr "Sett inn fil ..."
+
+#, fuzzy
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Innstillingar"
diff --git a/po/no.po b/po/no.po
index bb7792a0e1..05c3613b08 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-07-31 14:16+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-31 14:54+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -633,15 +633,6 @@ msgstr "Kategori inneholder"
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
-#.
-#. * 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
-msgid "(none)"
-msgstr "(ingen)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: addressbook/gui/contact-editor/e-contact-editor.c:1536
@@ -844,7 +835,7 @@ msgstr "_Kontakter..."
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slett"
@@ -1325,7 +1316,7 @@ msgstr "Send melding til kontakt"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
@@ -1340,7 +1331,7 @@ msgstr "Skriv ut konvolutt"
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
@@ -2652,7 +2643,7 @@ msgstr ""
 "Overskriv den?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Lagre som..."
 
@@ -3765,7 +3756,7 @@ msgstr "Skriv ut oppf�ring"
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
@@ -3874,7 +3865,6 @@ msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
@@ -4532,8 +4522,8 @@ msgstr "For lesing og lagring av e-post p� IMAP-tjenere."
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
-"Dette valget vil la deg koble til en IMAP-tjener ved � bruke et klartekst-"
-"passord."
+"Dette valget vil la deg koble til en IMAP-tjener ved � bruke et "
+"klartekst-passord."
 
 #: camel/providers/imap/camel-imap-store.c:463
 #, c-format
@@ -5111,8 +5101,8 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 "For tilkobling til POP-tjenere. POP-protokollen kan ogs� brukes for � hente "
-"e-post fra enkelte e-posttilbydere via web i tillegg til propriet�re e-"
-"postsystemer."
+"e-post fra enkelte e-posttilbydere via web i tillegg til propriet�re "
+"e-postsystemer."
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
@@ -5120,8 +5110,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Dette alternativet lar deg koble til POP-tjeneren ved bruk av passord i "
-"klartekst. Dette er det eneste alternativet som er st�ttet av mange POP-"
-"tjenere."
+"klartekst. Dette er det eneste alternativet som er st�ttet av mange "
+"POP-tjenere."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -5740,11 +5730,11 @@ msgstr "�pne fil"
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2252
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2346
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -5772,30 +5762,6 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "Kropp inneholder"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneholder ikke"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneholder"
-
-#: default_user/searches.xml.h:4
-msgid "Sender contains"
-msgstr "Sender inneholder"
-
-#: default_user/searches.xml.h:5
-msgid "Subject contains"
-msgstr "Emne inneholder"
-
-#: default_user/searches.xml.h:6
-msgid "Subject does not contain"
-msgstr "Emne inneholder ikke"
-
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
 #: e-util/e-time-utils.c:239
@@ -6490,7 +6456,7 @@ msgstr "Filtrer p� e-_postliste"
 msgid "Resend"
 msgstr "Send p� nytt"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
 #: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -6499,15 +6465,15 @@ msgstr "Lagre _som..."
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
@@ -6515,11 +6481,11 @@ msgstr "Svar til _alle"
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
@@ -6539,7 +6505,7 @@ msgstr "Fl_ytt til mappe..."
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
@@ -7010,8 +6976,7 @@ msgstr "Skisser"
 msgid "Drafts folder:"
 msgstr "Skissemappe:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Rediger..."
 
@@ -7943,38 +7908,6 @@ msgstr "Utskrift av Min Evolution feilet"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
 
-#: my-evolution/metar.c:29
-msgid "�F"
-msgstr "�F"
-
-#: my-evolution/metar.c:29
-msgid "�C"
-msgstr "�C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "knop"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kpt"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "engelske mil"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometer"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -9787,7 +9720,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:173
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullf�rt)"
 
@@ -10028,7 +9960,7 @@ msgstr "Opprett en ny avtale"
 msgid "Create an event for the whole day"
 msgstr "Opprett en hendelse for hele dagen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "G� til"
 
@@ -10141,7 +10073,7 @@ msgstr "Hovedverkt�ylinje"
 msgid "Preview the printed item"
 msgstr "Forh�ndsvisning av oppf�ring som skal skrives ut"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:10
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Forh�ndsvisning av utskrift"
 
@@ -10627,171 +10559,206 @@ msgstr "Videresend den valgte meldingen til noen"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Last b_ilder"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Merk som _viktig"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Merk som uv_iktig"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ikke lest"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Velg _tr�d"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "�pne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "�pne valgt melding i redigeringsvinduet for � sende den p� nytt"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Viser forh�ndsvisning av meldingen som skal skrives ut"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Skriv ut melding..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Forh�ndsvisning av utskrift"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "S�k i m_elding"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "S�k etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin r�e form"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder p� e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VFolder p� e_mne..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_P�f�r filtre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Videresend melding"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_�pne melding"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Send melding p� nytt"
 
@@ -11060,49 +11027,47 @@ msgid "Re_fresh Task"
 msgstr "O_ppdater oppgave"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Konfigurer innstillinger for kalender"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgave fra utklippstavlen"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Lagre oppgave som noe annet"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Set task view preferences"
-msgstr "Endre brukervalg for oppgavevisning"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Brukervalg for oppgaver"
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Inns_tillinger for oppgaver..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ui/evolution-tasks.xml.h:20
-msgid "_Tasks Settings..."
-msgstr "Inns_tillinger for oppgaver..."
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
@@ -11530,11 +11495,11 @@ msgstr "Lagre s�k"
 msgid "Advanced Search"
 msgstr "Avansert s�k"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alle"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avansert..."
 
@@ -11587,6 +11552,57 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "Body contains"
+#~ msgstr "Kropp inneholder"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Kropp inneholder ikke"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Kropp eller emne inneholder"
+
+#~ msgid "Sender contains"
+#~ msgstr "Sender inneholder"
+
+#~ msgid "Subject contains"
+#~ msgstr "Emne inneholder"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne inneholder ikke"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ msgid "�C"
+#~ msgstr "�C"
+
+#~ msgid "knots"
+#~ msgstr "knop"
+
+#~ msgid "kph"
+#~ msgstr "kpt"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "engelske mil"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometer"
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Endre brukervalg for oppgavevisning"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Brukervalg for oppgaver"
+
 #~ msgid "File not found"
 #~ msgstr "Fil ikke funnet"
 
@@ -11627,11 +11643,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Videresendt melding (uten emne)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-#~ "s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
-#~ "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> %"
-#~ "s<br><b>Emne:</b> %s<br>"
+#~ "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> "
+#~ "%s<br><b>Emne:</b> %s<br>"
 
 #~ msgid "Wipe trackers"
 #~ msgstr "Visk ut sporere"
@@ -11973,8 +11989,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "This applet monitors the charge of your laptop's battery.  Click on it to "
 #~ "change display modes."
 #~ msgstr ""
-#~ "Denne appleten overv�ker str�mstyrken til batteriet p� din b�rbare. Klikk "
-#~ "p� den for � endre visningsmodus."
+#~ "Denne appleten overv�ker str�mstyrken til batteriet p� din b�rbare. Klikk p� "
+#~ "den for � endre visningsmodus."
 
 #~ msgid "Could not allocate space for graph values"
 #~ msgstr "Kunne ikke allokere plass for grafverdiene"
@@ -12120,8 +12136,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Gnome panel applet for copying and retrieving selections with a history "
 #~ "list. Released under GNU General Public Licence."
 #~ msgstr ""
-#~ "Gnome Panel applet for � kopiere og hente tilbake utvalg med en "
-#~ "historikk. Utgitt under GNU General Puclic License."
+#~ "Gnome Panel applet for � kopiere og hente tilbake utvalg med en historikk. "
+#~ "Utgitt under GNU General Puclic License."
 
 #~ msgid "John Ellis <johne@bellatlantic.net>"
 #~ msgstr "John Ellis <johne@bellatlantic.net>"
@@ -12139,9 +12155,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "arrives."
 #~ msgstr ""
 #~ "Utgitt under GNU general public license.\n"
-#~ "Enkel digital klokke med dato i verkt�ystips. Valgfri 12/24-timers "
-#~ "visning. Blinking for post kan v�re for enhver ulest melding, eller bare "
-#~ "kort n�r ny post ankommer."
+#~ "Enkel digital klokke med dato i verkt�ystips. Valgfri 12/24-timers visning. "
+#~ "Blinking for post kan v�re for enhver ulest melding, eller bare kort n�r ny "
+#~ "post ankommer."
 
 #~ msgid "%a, %b %d"
 #~ msgstr "%a, %b %d"
@@ -12198,8 +12214,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "The CPU/Mem usage applet displays your system resources with 3 colorful "
 #~ "stacked bar graphs (processor, memory, swap)"
 #~ msgstr ""
-#~ "CPU-/minnebruk appleten viser ressursene p� ditt system med tre "
-#~ "fargefulle s�ylediagrammer (prosessor, minne, swap)"
+#~ "CPU-/minnebruk appleten viser ressursene p� ditt system med tre fargefulle "
+#~ "s�ylediagrammer (prosessor, minne, swap)"
 
 #~ msgid "File Systems"
 #~ msgstr "Filsystemer"
@@ -12341,11 +12357,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Copyright (C) The Free Software Foundation"
 
 #~ msgid ""
-#~ "Sam Lloyd's all-time favorite game, now for your delight in the Gnome "
-#~ "Panel. Guaranteed to be a productivity buster."
+#~ "Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. "
+#~ "Guaranteed to be a productivity buster."
 #~ msgstr ""
-#~ "Sam Lloyds favorittspill, n� til alles begeistring tilgjengelig i Panelet."
-#~ "Garantert �deleggende for produktiviteten."
+#~ "Sam Lloyds favorittspill, n� til alles begeistring tilgjengelig i "
+#~ "Panelet.Garantert �deleggende for produktiviteten."
 
 #~ msgid "Can't create fifteen applet!"
 #~ msgstr "Kan ikke opprette femten appleten!"
@@ -12426,17 +12442,15 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "� 1998-2000 Free Software Foundation"
 
 #~ msgid ""
-#~ "This applet switches between keyboard maps. It uses setxkbmap, or "
-#~ "xmodmap.\n"
+#~ "This applet switches between keyboard maps. It uses setxkbmap, or xmodmap.\n"
 #~ "Mail me your flag, please (60x40 size), I will put it to CVS.\n"
 #~ "So long, and thanks for all the fish.\n"
 #~ "Thanks for Balazs Nagy (Kevin) <julian7@kva.hu> for his help and Emese "
 #~ "Kovacs <emese@eik.bme.hu> for her solidarity."
 #~ msgstr ""
-#~ "Denne appleten bytter mellom forskjellige tastaturkart. Den bruker "
-#~ "setxkbmap eller xmodmap. Send meg flagget ditt er du snill (60x40 "
-#~ "st�rrelse), s� skal jeg legge det inn i CVS. Ha det og takk for all "
-#~ "fisken.\n"
+#~ "Denne appleten bytter mellom forskjellige tastaturkart. Den bruker setxkbmap "
+#~ "eller xmodmap. Send meg flagget ditt er du snill (60x40 st�rrelse), s� skal "
+#~ "jeg legge det inn i CVS. Ha det og takk for all fisken.\n"
 #~ "Takk til Balazs Nagy (Kevin) <julian7@kva.hu> for hjelpen og Emese Kovacs "
 #~ "<emese@eik.bme.hu> for hennes solidaritet."
 
@@ -12778,14 +12792,14 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "GNOME Aksjeoverv�ker"
 
 #~ msgid ""
-#~ "This program connects to a popular site and downloads current stock "
-#~ "quotes.  The GNOME Stock Ticker is a free Internet-based application.  It "
-#~ "comes with ABSOLUTELY NO WARRANTY.  Do not use the GNOME Stock Ticker for "
-#~ "making investment decisions; it is for informational purposes only."
+#~ "This program connects to a popular site and downloads current stock quotes.  "
+#~ "The GNOME Stock Ticker is a free Internet-based application.  It comes with "
+#~ "ABSOLUTELY NO WARRANTY.  Do not use the GNOME Stock Ticker for making "
+#~ "investment decisions; it is for informational purposes only."
 #~ msgstr ""
 #~ "Dette programmet laster ned aksjekurser fra popul�re nettsteder. GNOME "
-#~ "aksjeoverv�ker er en fri internett-basert applikasjon. Det f�lger IKKE "
-#~ "MED NOEN GARANTIER. Ikke bruk GNOME aksjeoverv�ker til � gj�re "
+#~ "aksjeoverv�ker er en fri internett-basert applikasjon. Det f�lger IKKE MED "
+#~ "NOEN GARANTIER. Ikke bruk GNOME aksjeoverv�ker til � gj�re "
 #~ "investeringsavgj�relser; kun for informasjonsform�l."
 
 #~ msgid "New Symbol:"
@@ -12911,8 +12925,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
 #~ msgid ""
 #~ "Detailed forecast not available for this location.\n"
-#~ "Please try the state forecast; note that IWIN forecasts are available "
-#~ "only for US cities."
+#~ "Please try the state forecast; note that IWIN forecasts are available only "
+#~ "for US cities."
 #~ msgstr ""
 #~ "Detaljert v�rmelding er ikke tilgjengelig for denne plassen.\n"
 #~ "Vennligst pr�v melding for staten; merk at IWIN meldingene kun er "
@@ -13062,12 +13076,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "clock.\n"
 #~ "\n"
 #~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the "
-#~ "Free Software Foundation; either version 2 of the License, or (at your "
-#~ "option) any later version."
+#~ "under the terms of the GNU General Public License as published by the Free "
+#~ "Software Foundation; either version 2 of the License, or (at your option) "
+#~ "any later version."
 #~ msgstr ""
-#~ "Denne GNOME-appleten legger til en kommandolinje p� panelet. Denne "
-#~ "st�tter\n"
+#~ "Denne GNOME-appleten legger til en kommandolinje p� panelet. Denne st�tter\n"
 #~ "kommando-komplettering, kommando-historikk, redigerbare makroer og en\n"
 #~ "valgfri, innebygget klokke.\n"
 #~ "\n"
@@ -13214,8 +13227,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "(c) 1998 the Free Software Foundation"
 
 #~ msgid ""
-#~ "The mixer applet gives you instant access to setting the master volume "
-#~ "level on your soundcard device"
+#~ "The mixer applet gives you instant access to setting the master volume level "
+#~ "on your soundcard device"
 #~ msgstr ""
 #~ "Mikserappleten gir deg umiddelbar tilgang til innstillingene av lydniv�et "
 #~ "for din lydenhet"
@@ -13468,8 +13481,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "(C) 1999 the Free Software Foundation"
 
 #~ msgid ""
-#~ "a GNOME applet that tracks and measures the movements of your mouse "
-#~ "pointer across the desktop."
+#~ "a GNOME applet that tracks and measures the movements of your mouse pointer "
+#~ "across the desktop."
 #~ msgstr ""
 #~ "en GNOME applet som f�lger og m�ler bevegelsen til muspekeren over "
 #~ "skrivebordet."
@@ -13496,13 +13509,13 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Hurtigstart applet"
 
 #~ msgid ""
-#~ "This applet adds some pretty small icons for your launchers to your "
-#~ "panel, like the windowish QuickLaunch toolbar, avoiding that annoying "
-#~ "huge GNOME launchers."
+#~ "This applet adds some pretty small icons for your launchers to your panel, "
+#~ "like the windowish QuickLaunch toolbar, avoiding that annoying huge GNOME "
+#~ "launchers."
 #~ msgstr ""
-#~ "Denne appleten legger til noen ganske sm� ikoner for oppstartere p� "
-#~ "panelet, slik som hurtigstartmenylinjen i Windows, og unng�r de sv�re "
-#~ "GNOME startknappene."
+#~ "Denne appleten legger til noen ganske sm� ikoner for oppstartere p� panelet, "
+#~ "slik som hurtigstartmenylinjen i Windows, og unng�r de sv�re GNOME "
+#~ "startknappene."
 
 #~ msgid "Launcher Properties"
 #~ msgstr "Egenskaper for oppstarter"
@@ -13601,8 +13614,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "jpg, jpeg, bmp, cgm, cmyk, dib, eps, fig, fpx, gif, ico, map, miff, pcx,\n"
 #~ "pict, pix, png, pnm, ppm, psd, rgb, rgba, rla, rle, tiff, tga, xbm, xpm,\n"
 #~ "and several obscure ones. Try your luck with something interesting!\n"
-#~ "Eg .html for a client-side image map. You'll get a .gif, .html, and a ."
-#~ "shtml\n"
+#~ "Eg .html for a client-side image map. You'll get a .gif, .html, and a "
+#~ ".shtml\n"
 #~ "\n"
 #~ "Recommendations:\n"
 #~ "Small file, pretty good quality:   jpg, 75% quality\n"
@@ -13615,13 +13628,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "jpg, jpeg, bmp, cgm, cmyk, dib, eps, fig, fpx, gif, ico, map, miff, pcx,\n"
 #~ "pict, pix, png, pnm, ppm, psd, rgb, rgba, rla, rle, tiff, tga, xbm, xpm,\n"
 #~ "og flere andre obskure typer. Pr�v ditt hell med noe interessant!\n"
-#~ "For eksempel .html for et klientside bildekart. Du vil f� et .gif, .html "
-#~ "og et .shtml.\n"
+#~ "For eksempel .html for et klientside bildekart. Du vil f� et .gif, .html og "
+#~ "et .shtml.\n"
 #~ "\n"
 #~ "Forslag:\n"
 #~ "Liten fil ganske god kvalitet:        jpg, 75% kvalitet\n"
-#~ "Litt st�rre fil men uten tap av data: png, s� mye kompresjon som du "
-#~ "�nsker.\n"
+#~ "Litt st�rre fil men uten tap av data: png, s� mye kompresjon som du �nsker.\n"
 #~ "- kompresjon av png filer tar lengre tid ved h�yere rater, men er likevel "
 #~ "uten tap av data"
 
@@ -13652,26 +13664,25 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Bruk h�ykvalitets mellomlagring under oppretting av miniatyr"
 
 #~ msgid ""
-#~ "(This'll chug loads of CPU, but will prevent compressing the image twice "
-#~ "if a\n"
+#~ "(This'll chug loads of CPU, but will prevent compressing the image twice if "
+#~ "a\n"
 #~ "lossy file format is used)\n"
 #~ "Don't use this if you're using a lossless compression format, or if you "
 #~ "cherish\n"
 #~ "speed and don't mind imperfection in your thumbnails."
 #~ msgstr ""
-#~ "(Dette vil bruke mye prosessorkraft, men vil forhindre at bildet "
-#~ "komprimeres \n"
+#~ "(Dette vil bruke mye prosessorkraft, men vil forhindre at bildet komprimeres "
+#~ "\n"
 #~ "to ganger hvis du bruker et format som taper data)\n"
-#~ "Ikke bruk dette alternativet hvis du bruker et tapsfritt "
-#~ "kompresjonsformat, eller hvis du setter pris p� \n"
+#~ "Ikke bruk dette alternativet hvis du bruker et tapsfritt kompresjonsformat, "
+#~ "eller hvis du setter pris p� \n"
 #~ "hurtighet og ikke bryr deg om mindre feil i miniatyrene."
 
 #~ msgid "Thumbnails"
 #~ msgstr "Miniatyrer"
 
 #~ msgid ""
-#~ "All post-processing, frill and spurious options will chug more CPU than "
-#~ "a\n"
+#~ "All post-processing, frill and spurious options will chug more CPU than a\n"
 #~ "simple screenshot, due to the creation and then conversion of an "
 #~ "intermediate\n"
 #~ "image. Intensive operations may take some time on less spiffy CPUs."
@@ -13740,8 +13751,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "specified on the commandline as follows:\n"
 #~ "{Script_Name} {Image_Filename} {Thumbnail_filename_if_specified}\n"
 #~ "Hint: I use a script to update my website screenshot page.\n"
-#~ "An example script should've been included in the tarball, or at my "
-#~ "website."
+#~ "An example script should've been included in the tarball, or at my website."
 #~ msgstr ""
 #~ "Skript/program som vil startes etter oppretting av bildet med bildets\n"
 #~ "filnavn spesifisert p� kommandolinjen som f�lger:\n"
@@ -13978,8 +13988,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "\n"
 #~ "If your sound card is not fully 100% FULL DUPLEX (can do input and output "
 #~ "simultaneously),\n"
-#~ "then this may touch bugs in sound drivers/esound that may hang the "
-#~ "system.\n"
+#~ "then this may touch bugs in sound drivers/esound that may hang the system.\n"
 #~ "\n"
 #~ "You have been warned!"
 #~ msgstr ""
@@ -13987,8 +13996,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "\n"
 #~ "Hvis ditt lydkort ikke st�tter FULL DUPLEX 100% (opptak og avspilling p� "
 #~ "same tid),\n"
-#~ "s� kan dette fremtvinge feil i lyddriverene/esound som kan f� systemet "
-#~ "til � henge.\n"
+#~ "s� kan dette fremtvinge feil i lyddriverene/esound som kan f� systemet til � "
+#~ "henge.\n"
 #~ "\n"
 #~ "Du er herved advart!"
 
@@ -14567,12 +14576,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Delete this message"
 #~ msgstr "Slett denne meldingen"
 
-#~ msgid "Previous message"
-#~ msgstr "Forrige melding"
-
-#~ msgid "Next message"
-#~ msgstr "Neste melding"
-
 #~ msgid "Select everything"
 #~ msgstr "Velg alt"
 
@@ -15038,8 +15041,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr ""
-#~ "Videresend denne meldingen \"in-line\" med din e-post, s� du kan redigere "
-#~ "den"
+#~ "Videresend denne meldingen \"in-line\" med din e-post, s� du kan redigere den"
 
 #~ msgid "Hide Deleted Messages"
 #~ msgstr "Skjul slettede meldinger"
@@ -15171,8 +15173,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "PLAIN"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism "
-#~ "if the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
 #~ msgstr ""
 #~ "Dette alternativet kobler til tjeneren med bruk av PLAIN SASL-mekanismen "
 #~ "hvis tjeneren st�tter det."
@@ -15194,23 +15196,23 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Sikker POP"
 
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol "
-#~ "can also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
-#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen "
-#~ "kan ogs� brukes for � hente e-post fra enkelte e-posttilbydere via web i "
-#~ "tillegg til propriet�re e-postsystemer."
+#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen kan "
+#~ "ogs� brukes for � hente e-post fra enkelte e-posttilbydere via web i tillegg "
+#~ "til propriet�re e-postsystemer."
 
 #~ msgid "Secure SMTP"
 #~ msgstr "Sikker SMTP"
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
-#~ "SSL connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
 #~ msgstr ""
-#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en SSL-"
-#~ "forbindelse.\n"
+#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en "
+#~ "SSL-forbindelse.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -15712,8 +15714,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid ""
 #~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
 #~ msgstr ""
-#~ "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte "
-#~ "meldinger."
+#~ "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
 
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Henter melding %d av %d"
@@ -15767,13 +15768,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Gratulerer, konfigurasjon av e-post er fullf�rt.\n"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may "
-#~ "also, optionally, enter the name of your organization, and the name of a "
-#~ "file to read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
 #~ msgstr ""
-#~ "Skriv inn ditt navn og din e-post adresse for bruk i utg�ende post. Du "
-#~ "kan ogs� skrive inn navnet p� din organisasjon, og navnet p� en "
-#~ "signaturfil."
+#~ "Skriv inn ditt navn og din e-post adresse for bruk i utg�ende post. Du kan "
+#~ "ogs� skrive inn navnet p� din organisasjon, og navnet p� en signaturfil."
 
 #~ msgid "Full name:"
 #~ msgstr "Fullt navn:"
@@ -15785,50 +15785,47 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Type e-post-kilde:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon "
-#~ "om denne.\n"
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
 #~ "\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke p� \"S�k etter "
-#~ "st�ttede typer...\" knappen etter at du har skrevet inn resten av "
-#~ "informasjonen."
+#~ "Hvis tjeneren trenger autentisering, kan du klikke p� \"S�k etter st�ttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
 #~ msgid "News source type:"
 #~ msgstr "Type news-kilde:"
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon "
-#~ "om denne.\n"
+#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
 #~ "\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke p� \"S�k etter "
-#~ "st�ttede typer...\"-knappen etter at du har skrevet inn resten av "
-#~ "informasjonen."
+#~ "Hvis tjeneren trenger autentisering, kan du klikke p� \"S�k etter st�ttede "
+#~ "typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
 
 #~ msgid "Mail transport type:"
 #~ msgstr "Type e-post-transport"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant "
-#~ "information about it.\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon "
-#~ "om denne.\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke p� \"S�k etter "
-#~ "st�ttede typer...\" knappen etter at du har skrevet inn resten av "
-#~ "informasjonen."
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke p� \"S�k etter st�ttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
 #~ msgid "Add Identity"
 #~ msgstr "Legg til identitet"
@@ -15894,8 +15891,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Videresend meldingen \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded "
-#~ "message."
+#~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
 #~ "Kunne ikke generere MIME-del fra melding under generering av videresendt "
 #~ "melding."
@@ -16108,8 +16104,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-"
-#~ "post p� lokal disk."
+#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
+#~ "p� lokal disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Kunne ikke endre navn p� mappe %s til %s: m�let eksisterer"
diff --git a/po/pl.po b/po/pl.po
index 512826e930..50be7c2f05 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-13 10:36+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-13 19:47+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 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 "Impurtuje pliki VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -29,7 +29,7 @@ msgstr ""
 "\n"
 "Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -37,7 +37,7 @@ msgstr ""
 "\n"
 "  Przedrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -45,7 +45,7 @@ msgstr ""
 "\n"
 "  Imi�:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "  Dodatkowe:  "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -61,7 +61,7 @@ msgstr ""
 "\n"
 "  Rodzina:    "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -69,7 +69,7 @@ msgstr ""
 "\n"
 "  Przyrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Data urodzenia: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -85,7 +85,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -93,13 +93,13 @@ msgstr ""
 "\n"
 "  Skrzynka pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -107,7 +107,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -115,7 +115,7 @@ msgstr ""
 "\n"
 "  Miasto:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -123,7 +123,7 @@ msgstr ""
 "\n"
 "  Region:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +131,7 @@ msgstr ""
 "\n"
 "  Kod pocztowy: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -139,13 +139,13 @@ msgstr ""
 "\n"
 "  Kraj:        "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefony:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -177,13 +177,13 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +191,7 @@ msgstr ""
 "\n"
 "Strefa czasowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,7 +199,7 @@ msgstr ""
 "\n"
 "Po�o�enie geograficzne: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -207,7 +207,7 @@ msgstr ""
 "\n"
 "Stanowisko s�u�bowe: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -215,7 +215,7 @@ msgstr ""
 "\n"
 "Organizacja: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -223,7 +223,7 @@ msgstr ""
 "\n"
 "  Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -231,7 +231,7 @@ msgstr ""
 "\n"
 "  Jednostka: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -239,7 +239,7 @@ msgstr ""
 "\n"
 "  Jednostka2: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -247,7 +247,7 @@ msgstr ""
 "\n"
 "  Jednostka3: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -255,7 +255,7 @@ msgstr ""
 "\n"
 "  Jednostka4: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -263,7 +263,7 @@ msgstr ""
 "\n"
 "Kategorie: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -281,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -289,7 +289,7 @@ msgstr ""
 "\n"
 "Unikatowy napis: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -297,49 +297,49 @@ msgstr ""
 "\n"
 "Klucz publiczny: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
-#: 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
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo�na zainicjowa� Bonobo"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:201
 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:214
 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:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 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:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 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:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -347,161 +347,162 @@ msgstr ""
 msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Evolution addressbook component."
 msgstr "Generator komponent�w ksi��ki adresowej Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "Plik"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Nieznany typ ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "Nic (tryb anonimowy)"
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: 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
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr "Has�o"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "Nieznany typ uwierzytelnienia"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "Poddrzewo"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "Nieznany typ zakresu"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "��cz z DN:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:350
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Zapami�tanie has�a"
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
 msgid "Host:"
 msgstr "Komputer:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:406
 msgid "Root DN:"
 msgstr "Nadrz�dny DN:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:411
 msgid "Port:"
 msgstr "Port:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:412
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:432
 msgid "Search Scope:"
 msgstr "Zakres wyszukiwania:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:479
 msgid "Authentication:"
 msgstr "Uwierzytelnianie:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:501
 msgid "Advanced LDAP Options"
 msgstr "Zaawansowane opcje LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "�cie�ka:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:523
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:528
 msgid "Create path if it doesn't exist."
 msgstr "Stworzenie �cie�ki je�li nie istnieje."
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Ustawienia ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "Dodaj ksi��k� adresow�"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -509,22 +510,22 @@ msgstr ""
 "Wybierz rodzaj uzywanej ksi��ki adresowej i wprowad� koniecznie inforacje o "
 "niej."
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1 my-evolution/e-summary-preferences.c:1
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: calendar/gui/e-itip-control.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -532,50 +533,49 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "�r�d�a ksi��ek adresowych"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "De_lete"
 msgstr "_Usu�"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Name"
 msgstr "Nazwa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "URI"
 msgstr "URI"
 
-#: 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
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: mail/mail-config.glade.h:1 ui/evolution-comp-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
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/addressbook-storage.c:1
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:345
 #, c-format
 msgid "Enter password for %s"
 msgstr "Podaj has�o dla %s"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:373
 msgid "Unable to open addressbook"
 msgstr "Nie mo�na otworzy� ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:380
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -584,7 +584,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:385
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -595,7 +595,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:393
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -603,92 +603,83 @@ 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 calendar/gui/gnome-cal.c:1
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:555
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:556
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:557
 msgid "Category contains"
 msgstr "Kategoria zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 
-#.
-#. * 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:1
-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:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "G��wny e-mail"
 
-#: 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/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: 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/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:579
 msgid "Select an Action"
 msgstr "Wyb�r czynno�ci"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:585
 #, 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:597
 #, 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:859
 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:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
 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:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 msgid "Add to Contacts"
 msgstr "Dodaj do kontakt�w"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:989
 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:365
 msgid "Disable Queries"
 msgstr "Wy��cz zapytania"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:365
 msgid "Enable Queries (Dangerous!)"
 msgstr "W��cz zapytania (Niebezpieczne!)"
 
@@ -696,184 +687,191 @@ 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 filter/filter.glade.h:1
-#: shell/e-shortcuts-view.c:1 shell/e-shortcuts-view.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 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:171
 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:195
 msgid "Send HTML Mail?"
 msgstr "Czy wys�a� list jako HTML?"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Zmieniony kontakt:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
 msgstr "Odbiorcy listu"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 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:3
 msgid "Select name from _folder:"
 msgstr "Wybierz nazw� z f_olderu:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: mail/mail-search-dialogue.c:1
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Znajd�"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "Add"
-msgstr "Dodaj"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Rocznice:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Praca"
 
-#: 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
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "K_ategorie..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 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:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Szczeg�y"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Zapisz jako:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Og�lne"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 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:10
 msgid "No_tes:"
 msgstr "_Notatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "Organi_zation:"
 msgstr "_Organizacja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Typy telefon�w"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 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:15
 msgid "Web page address:"
 msgstr "Adres strony WWW:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Nazwisko asystenta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 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:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 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
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 mail/folder-browser.c:1
-#: mail/mail-config.glade.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:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Usu�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Oddzia�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Pe�na nazwa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Dom"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 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:27
 msgid "_Manager's Name:"
 msgstr "Nazwisko s_zefa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "P_rzeno�ny"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Przydomek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Zaw�d:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Ma��onek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_To jest adres pocztowy"
 
@@ -881,112 +879,112 @@ msgstr "_To jest adres pocztowy"
 msgid "Delete Contact?"
 msgstr "Usun�� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 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/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asystent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Praca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Praca 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Faks s�u�bowy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Samoch�d"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Dom 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Faks w domu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Przeno�ny"
 
-#: 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/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Inny faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "G��wny"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodawanie kontakt�w"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 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:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 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:294
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -994,43 +992,43 @@ msgstr "E-mail"
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Sprawd� adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Skrzynka p_ocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Kod pocztowy:"
 
@@ -1038,67 +1036,67 @@ msgstr "_Kod pocztowy:"
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr"
 
-#: 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�:"
 
@@ -1106,28 +1104,28 @@ 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
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 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:228
 msgid "Contact List Editor"
 msgstr "Edytor listy kontakt�w"
 
@@ -1135,20 +1133,20 @@ msgstr "Edytor listy kontakt�w"
 msgid "Add Anyway"
 msgstr "Dodaj mimo wszystko"
 
-#: 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:3
 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?"
@@ -1157,18 +1155,14 @@ msgstr ""
 "Czy chcesz doda� go mimo wszystko?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "Zmie� mimo wszystko"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 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:2
 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:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1176,8 +1170,13 @@ msgstr ""
 "Folder zawiera ju� kontakt o tej samej nazwie lub adresie e-mail.\n"
 "Czy chcesz doda� go mimo wszystko?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: mail/mail-search.c:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Zmie� mimo wszystko"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Wyszukiwanie"
 
@@ -1185,341 +1184,342 @@ msgstr "Wyszukiwanie"
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:2
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:3
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:4
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:5
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
-#: 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-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
-#: 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:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Wy�lij kontakt do innej osoby"
 
-#: 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:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 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-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/my-evolution.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: 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:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1 filter/filter.glade.h:1
-#: filter/libfilter-i18n.h:1 mail/mail-config.glade.h:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-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:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
 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:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
 msgid "Error modifying card"
 msgstr "B��d przy modyfikacji karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 msgid "Success"
 msgstr "Sukces"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: camel/providers/imap/camel-imap-command.c:1 shell/e-storage.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Nieznany b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1 shell/e-storage.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card not found"
 msgstr "Nie odnaleziono karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 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:40
 msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Canceled"
 msgstr "Anulowano"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 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:59
 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:68
 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:78
 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:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Kliknij tutaj by doda� kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Zapisz jako"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "G��wny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Telefon asystenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Adres firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Adres domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Telefon przeno�ny"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Inny adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Serwis WWW"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Oddzia�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Biuro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Tytu�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Zaw�d"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Menad�er"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Przydomek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Notka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL sygnalizuj�cy zaj�to��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Gotowe."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Usuwanie kart..."
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:283
 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:151
 msgid ""
 "\n"
 "\n"
@@ -1533,7 +1533,7 @@ msgstr ""
 "\n"
 "Podw�jne 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"
 
@@ -1541,178 +1541,184 @@ 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
-msgid "Font..."
+#: addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
+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��:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Czcionka..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 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:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1720,81 +1726,86 @@ msgstr ""
 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:2
 msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 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:4
 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:5
 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:6
 msgid "Factory for the Evolution calendar component."
 msgstr "Generator komponent�w kalendarza Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Generator komponent�w kalendarza Evolution."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 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:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Przypomnienie o terminie rozpoczynaj�cym si� o %s i ko�cz�cym o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Przypomnienie o terminie rozpoczynaj�cym si� o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Przypomnienie o terminie ko�cz�cym si� o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Przypomnienie o terminie"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Przypomnienie o zadaniu rozpoczynaj�cym si� o %s i ko�cz�cym o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Przypomnienie o zadaniu rozpoczynaj�cym si� o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Przypomnienie o zadaniu ko�cz�cym si� o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Przypomnienie o zadaniu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm o %A %d %b %Y %H:%M"
 
@@ -1803,178 +1814,201 @@ msgstr "Alarm o %A %d %b %Y %H:%M"
 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 ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr ""
 
-#: 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:487
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr "Przypomnienie o terminie "
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:991
 msgid "Snooze"
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Nie mo�na zainicjowa� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo�na zainicjowa� gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:115
 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
-msgid "File not found"
-msgstr "Nie odnaleziono pliku"
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1
-msgid "Open calendar"
-msgstr "Otw�rz kalendarz"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1
-msgid "Save calendar"
-msgstr "Zapisz kalendarz"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:1
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 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:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 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:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.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/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Wysoki"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Zwyk�y"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Niski"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Przezroczy�cie"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Przejrzy�cie"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Przed rozpocz�ciem"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Trwaj�ce"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Zako�czone"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 camel/camel-service.c:1
-#: camel/camel-service.c:1
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Anulowane"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:1 e-util/e-time-utils.c:1
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:1 e-util/e-time-utils.c:1
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1985,26 +2019,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/e-timezone-dialog.c:1
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-calendar-table.c:1
-#: mail/mail-account-gui.c:1 mail/mail-accounts.c:1
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
-#: shell/e-shell-view.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/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2014,80 +2049,84 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1127
 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"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Priorytet musi by� okre�lony jako \"Wysoki\", \"Zwyk�y\", \"Niski\" lub "
 "\"Niezdefiniowany\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:149 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:152 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:155 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:158 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/control-factory.c:128
 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:354
 msgid "Audio Alarm Options"
 msgstr "Ustawienia alarmu d�wi�kowego"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:363
 msgid "Message Alarm Options"
 msgstr "Ustawienia alarmu z komunikatem"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:372
 msgid "Mail Alarm Options"
 msgstr "Ustawienia alarmu z wys�aniem listu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:381
 msgid "Program Alarm Options"
 msgstr "Ustawienia alarmu z uruchomieniem programu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:390
 msgid "Unknown Alarm Options"
 msgstr "Ustawienia nieznanego alarmu"
 
@@ -2095,124 +2134,124 @@ 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 "FIXME: mail alarm options"
 msgstr "Ustawienia alarmu z wys�aniem listu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Wy�wietlany komunikat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Odtwarzany d�wi�k:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Uruchamiany program:"
 
-#: 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:284
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 dzie�"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 tydzie�"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:306
 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:331
+#: 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:335
+#: 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.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 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:343
+#: 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:361
 msgid "before start of appointment"
 msgstr "przed pocz�tkiem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:364
 msgid "after start of appointment"
 msgstr "po pocz�tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:374
 msgid "before end of appointment"
 msgstr "przed ko�cem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:377
 msgid "after end of appointment"
 msgstr "po ko�cu terminu"
 
@@ -2222,56 +2261,56 @@ msgstr "po ko�cu terminu"
 msgid "Basics"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-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:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 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:11
 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:12 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:13 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:14
+#: 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:15
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 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:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "pocz�tek terminu"
 
@@ -2279,316 +2318,315 @@ 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 "12 hour (am/pm)"
 msgstr "12-godzinny (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Beep when alarm windows appear."
 msgstr "Sygna� d�wi�kowy przy pojawianiu si� okien alarmu."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: my-evolution/my-evolution.glade.h:1 shell/e-shortcuts.c:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Ustawienia termiarza"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 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:12
 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:13
 msgid "Colors for Tasks"
 msgstr "Kolory zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 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:15
 msgid "Date Navigator"
 msgstr "Nawigator daty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Domy�lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Wy�wietl"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "End of day:"
 msgstr "Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Pierwszy dzie� tygodnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pi�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Pi�tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Poniedzia�ek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Notification Options"
 msgstr "Opcje przypomnie�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Overdue tasks"
 msgstr "Zaleg�e zadania"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Przypominanie a wszystkich terminach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 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:32
 msgid "Show week numbers"
 msgstr "Wy�wietlanie numer�w tygodni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Pocz�tek dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 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:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Task List"
 msgstr "Lista zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Tasks due today"
 msgstr "Zadania na dzi�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Przedzia�y czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time zone:"
 msgstr "Strefa czasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "�ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "�roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work Week"
 msgstr "Tydzie� roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minut przed wyst�pieniem"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:52
 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:58
 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:63
 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:68
 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:60
 msgid "This event has been deleted."
 msgstr "Zadanie zosta�o usuni�te."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:64
 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:68
 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:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "% Wprowadzono zmiany. Anulowa� je wszystkie i zamkn�� edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:79
 #, 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:84
 msgid "This event has been changed."
 msgstr "Zdarzenie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Zadanie zosta�o zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:92
 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:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Zako�czone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Zako�czone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:449
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:474
 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:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
 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:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2596,53 +2634,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 widgets/misc/e-filter-bar.h:1
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:1026
 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:84
 #, 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:87
 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:93
 #, 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:96
 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:102
 #, 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:105
 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:120
 #, 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:125
 #, 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:130
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Czy na pewno chcesz usun�� %d wpis�w dziennika"
@@ -2651,15 +2689,15 @@ msgstr "Czy na pewno chcesz usun�� %d wpis�w dziennika"
 msgid "Select a Time Zone"
 msgstr "Wyb�r strefy czasowej"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
 msgid "Selection:"
 msgstr "Wyb�r:"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
 msgstr "Strefy czasowe"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/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"
@@ -2669,20 +2707,20 @@ msgstr ""
 "stref� czasow�.\n"
 "Przyci�ni�cie prawego przycisku przywraca zwyk�e powi�kszenie."
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Powtarzalno��"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -2690,50 +2728,174 @@ msgstr "Spotkanie"
 msgid "A_ll day event"
 msgstr "Wydarzenie _ca�odniowe"
 
-#: 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:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: 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:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data i czas"
 
-#: 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:13
 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:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: 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:19
 msgid "_Confidential"
 msgstr "_Tajny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "Czas _zako�czenia"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:11
 msgid "_Start time:"
 msgstr "Czas _rozpocz�cia:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nazwa grupy:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "�r�d�o"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Samoch�d"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Wymagane informacje"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Informacje opcjonalne"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Wyb�r czynno�ci"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Usuni�ty"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Usuni�ty"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Trwaj�ce"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon samochodowy"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Wymagane informacje"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Informacje opcjonalne"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Wys�ane przez:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -2741,584 +2903,581 @@ msgstr "_Oddeleguj do..."
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
 msgid "Common Name"
 msgstr "Wsp�lna nazwa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 msgid "Delegated From"
 msgstr "Oddelegowane od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 msgid "Delegated To"
 msgstr "Oddelegowane do"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
 msgid "Language"
 msgstr "J�zyk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 msgid "Member"
 msgstr "Cz�onek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1 filter/libfilter-i18n.h:1
-#: mail/message-list.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 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 mail/mail-config.glade.h:1
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: 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/dialogs/meeting-page.glade.h:4
 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/print.c:1
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:584
 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:938
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dzie�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "powt�rzeniami"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Dowolna powtarzalno��"
 
-#: 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 "No recurrence"
 msgstr "Brak powtarzalno�ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Podgl�d"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 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 "Simple recurrence"
 msgstr "Prosta powtarzalno��"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Modify"
 msgstr "_Zmie�"
 
-#: 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/save-comp.c:1
+#: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisa� zmiany?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:56
 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:61
 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:66
 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/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Data zako�czenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 msgid "Delegated From:"
 msgstr "Oddelegowane od:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Delegated To:"
 msgstr "Oddelegowane do:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:6
 msgid "No one"
 msgstr "Nikt"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: my-evolution/e-summary-preferences.c:1
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:1
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
 msgstr "% _zako�czenia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Progress"
 msgstr "Post�p"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "Sta_rt Date:"
 msgstr "Czas _rozpocz�cia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "Czas _zako�czenia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Priorytet:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Edit this task"
-msgstr "Zredaguj zadanie"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Otw�rz"
 
-#: calendar/gui/e-calendar-table.c:1 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
-msgid "Cut"
-msgstr "Wytnij"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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-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-mail-message.xml.h:1
-msgid "Copy"
-msgstr "Skopiuj"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:1 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
-msgid "Paste"
-msgstr "Wklej"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Usu� zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Oznacza zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1 ui/evolution-tasks.xml.h:1
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Kliknij tutaj, aby doda� zadanie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% zako�czenia"
 
-#: 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
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorie"
 
-#: 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:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
 msgid "Complete"
 msgstr "Zako�czone"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Pozycja geograficzna"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Start Date"
 msgstr "Data rozpocz�cia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:15
 msgid "Task sort"
 msgstr "Porz�dek zada�"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Transparency"
 msgstr "Prze�roczysto��"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:1
+#: calendar/gui/e-day-view-time-item.c:519
 #, 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: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:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %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
-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:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 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:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 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:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:1 ui/evolution-calendar.xml.h:1
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nowy termin ca�odniowy"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Go to Today"
-msgstr "Przejd� do dzisiaj"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Przejd� do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Przejd� do daty..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: shell/e-shortcuts-view.c:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-msgid "Open"
-msgstr "Otw�rz"
-
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Usu� termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w przesuwalne"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Usu� to wyst�pienie"
 
-#: calendar/gui/e-day-view.c:1
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Usu� wszystkie wyst�pienia"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "To jest zdarzenie, kt�re mo�na doda� do kalendarza."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "To jest jeden lub wi�cej dodatk�w do bie��cego spotkania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "To jest anulowanie zdarzenia."
 
-#: 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:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "List jest niezrozumia�y."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "To jest zadanie, kt�re mo�na doda� do kalendarza."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "To jest anulowanie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1015
 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.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-tasks.c:1 calendar/gui/e-tasks.c:1
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Wszystkie"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:403
 #, 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:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
@@ -3326,41 +3485,22 @@ msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 #. 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/e-week-view-main-item.c:1 calendar/gui/print.c:1
-#: my-evolution/e-summary-calendar.c:1
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nowy termin..."
 
-#: calendar/gui/e-week-view.c:1
-msgid "Delete All Occurrences"
-msgstr "Usu� wszystkie wyst�pienia"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Summary contains"
-msgstr "Zestawienie zawiera"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Description contains"
-msgstr "Opis zawiera"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Comment contains"
-msgstr "Komentarz zawiera"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Has category"
-msgstr "Ma kategori�"
-
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:999
 #, 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:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
@@ -3369,278 +3509,281 @@ msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
 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 "January"
 msgstr "Stycze�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Lipiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Czerwiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marzec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Maj"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Listopad"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Pa�dziernik"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "_Go To Today"
 msgstr "_Przejd� do dzi�"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Ni"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "�r"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:1 my-evolution/e-summary-tasks.c:1
-#: my-evolution/e-summary-tasks.c:1 shell/e-shortcuts.c:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Zadania"
 
 #. Day
-#: calendar/gui/print.c:1
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Bie��cy dzie� (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Bie��cy tydzie� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Bie��cy miesi�� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Bie��cy rok (%Y)"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2200
 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-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2398
 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 foldera zada�, kt�ry nale�y wy�wietli�"
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:106
 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:1
+#: calendar/gui/tasks-migrate.c:109
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -3648,7 +3791,7 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -3657,7 +3800,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:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -3666,31 +3809,31 @@ 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:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "NPW�CPS"
 
-#: 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 ""
 
-#: 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:181
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -3698,7 +3841,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:244
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -3709,70 +3852,69 @@ msgstr ""
 "%s\n"
 "Zmiany w tym folderze nie zostan� zsynchronizowane z serwerem."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:278
 msgid "Resynchronizing with server"
 msgstr "Ponowne synchronizowanie z serwerem"
 
-#: camel/camel-disco-store.c:1
+#: camel/camel-disco-store.c:305
 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:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie listu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:672
 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:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie listu %d z %d"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, 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:892
 #, 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:898
 #, 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:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3781,7 +3923,7 @@ msgstr ""
 "B��d w wyra�eniu wyszukiwania: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3790,239 +3932,239 @@ 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:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:559
 #, 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:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:110
 #, 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:123
 #, 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:199 camel/camel-lock-client.c:222
 #, 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:212
 #, 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:92 camel/camel-lock.c:111
 #, 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:151
 #, 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:201
 #, 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:255
 #, 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:108
 #, 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:122
 #, 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:130
 #, 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:159
 #, 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:189
 #, 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:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie mo�na stworzy� procesu: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:239
 #, 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:240
 msgid "(Unknown error)"
 msgstr "(Nieznany b��d)"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:263
 #, 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:274
 #, 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:467 camel/camel-movemail.c:534
 #, 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:193
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Wprowad� has�o NNTP dla %s@%s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Brak tekstu do podpisania."
 
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Nie podano has�a."
 
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo�na stworzy� potoku do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Brak tekstu do weryfikacji."
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Nie mo�na stworzy� pliku tymczasowego: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Brak tekstu do zaszyfrowania."
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Nie podano odbiorc�w"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nie mo�na za�adowa� %s: �adowanie modu��w nie jest obs�ugiwane przez system."
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo�na wczyta� %s: %s"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:148
 #, 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:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serwer %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:195
 #, 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:252
 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:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, 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:256
 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:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Swerwer nieoczekiwanie przerwa� po��czenie"
 
-#: 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"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:131
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -4031,7 +4173,7 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -4040,11 +4182,11 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\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."
@@ -4052,11 +4194,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."
@@ -4064,41 +4206,41 @@ 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 ""
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
@@ -4107,81 +4249,81 @@ 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:440
 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-search-private.c:1
+#: camel/camel-search-private.c:111
 #, 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:154
 #, 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:162
 #, 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:170
 #, 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:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:575
 #, 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:600
 #, 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:602
 #, 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:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:1 camel/camel-session.c:1
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, 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:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4190,50 +4332,44 @@ 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 ""
 
-#: 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:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
 #, 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:545
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:799
 msgid "Failed to decode message."
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:844
 msgid "Failed to verify certificates."
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#. Fill in the new fields
-#: camel/camel-store.c:1 mail/mail-ops.c:1 mail/mail-ops.c:1
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
-msgid "Trash"
-msgstr "�mietnik"
-
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4241,7 +4377,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:1 camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4256,7 +4392,7 @@ msgstr ""
 "\n"
 "Czy mimo wszystko chcesz go zaakceptowa�?"
 
-#: camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -4268,146 +4404,158 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:289
 #, 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:452
 #, 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:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Brak listu: %s"
 
-#: camel/camel-vtrash-folder.c:1
+#: camel/camel-vtrash-folder.c:109
 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:325
 #, 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:335
 #, 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:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:582
 #, 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:618
 #, 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:192
 #, 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:211
 #, 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:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zosta� usuni�ty stworzony ponownie."
 
-#: camel/providers/imap/camel-imap-folder.c:1
-msgid "Scanning IMAP folder"
-msgstr "Skanowanie folderu IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Zapisywanie 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:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 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:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Zapisywanie list�w"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 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:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nie mo�na otworzy� katalogu cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 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 "Sprawdza nowe listy 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:645
 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 ""
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: 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 "IMAPv4"
 msgstr "IMAPv4"
 
-#: 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:463
 #, 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:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, 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:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%Podaj 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:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 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:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4418,103 +4566,107 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1 mail/mail-local.c:1
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 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:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Do przechowywania lokalnej poczty w katalogach o formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standardowy uniksowy plik mailbox"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Do przechowywania lokalnej poczty w standardowym formacie mbox"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Pliki z listami w formacie maildir Qmaila"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Do przechowywania lokalnej poczty w katalogach maildir qmaila"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:70
 msgid "Unix mbox spool-format mail files"
 msgstr "Uniksowe pliki mbox w postaci kolejki pocztowej"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:71
 msgid "For storing local mail in standard Unix spool directories"
 msgstr ""
 "Do przechowywania lokalnej poczty w uniksowych katalogach kolejkuj�cych"
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:134
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "\"%s\" nie jest zwyk�ym plikiem."
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, 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:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:237
 #, 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:279
 #, 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:289
 #, 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-spool-summary.c:1
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 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:176
 #, 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:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4523,20 +4675,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:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 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:222
+#: camel/providers/local/camel-mh-folder.c:213
 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:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -4545,16 +4697,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:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "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:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -4563,56 +4715,56 @@ msgstr ""
 "Nie mo�na stworzy� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:129
 #, 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:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, 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:166
 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:276
 #, 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:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, 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:259
 #, 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:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4621,17 +4773,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:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -4640,7 +4792,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:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -4649,14 +4801,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:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwyk�ym plikiem."
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -4665,167 +4817,167 @@ msgstr ""
 "Nie mo�na usun�� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
 
 #. 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-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Tworzenie zestawienia folderu"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Nie mo�na otworzy� folderu: %s: tworzenie zestawienia od pozycji %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie mo�na stworzy� zestawienia 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-spool-summary.c:1 mail/mail-ops.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:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synchronizowanie folderu"
 
-#: 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-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nie mo�na otworzy� folderu aby stworzy� zestawienie: %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:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, 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: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:974
+#: camel/providers/local/camel-spool-summary.c:982
 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:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, 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:644
 #, 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:655
 #, 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:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, 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
 #, 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:110
 #, 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:465
 #, 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:132
 #, 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:159
 #, 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:176
 msgid "Spool stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:186
 #, 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:222
 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:230
 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:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
 #, 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:817
 #, 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:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4834,62 +4986,62 @@ msgstr ""
 "Nie mo�na zsynchronizowa� folderu kolejki %s: %s\n"
 "Folder mo�e by� uszkodzony, zapisano kopi� w \"%s\""
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:65
 msgid "Server rejected username"
 msgstr "Swerwer odrzuci� nazw� u�ytkownika"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:71
 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:80
 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:116
 #, 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:46
 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:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4897,63 +5049,63 @@ 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:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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:149
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:155
 #, 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:199
 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:292
 #, 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:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie listu %d z serwera POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:303
 #, 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:320
 #, 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-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Przechowywanie list�w"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:39
 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:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -4962,7 +5114,7 @@ msgstr ""
 "pobierania poczty z pewnych zamkni�tych system�w pocztowych i od dostawc�w "
 "poczty obs�ugiwanej poprzez www."
 
-#: 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."
@@ -4971,7 +5123,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 "
@@ -4981,34 +5133,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:199
 #, 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:215
 #, 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:322
 #, 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:361
 #, 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:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5017,18 +5169,18 @@ 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:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5037,17 +5189,17 @@ 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:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
-#: mail/mail-config.glade.h:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -5055,174 +5207,174 @@ 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:107
 #, 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:124
 #, 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:150
 #, 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:163
 #, 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:170
 #, 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:175
 #, 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:194
 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:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 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:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:170
 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:172
 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:174
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Us�uga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:184
 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:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transakcja nie powiod�a si�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:212
 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:214
 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:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:358
 #, 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:397
 #, 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:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5233,157 +5385,171 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, 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:538
 #, 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:563
 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:570
 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
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Wysy�anie listu"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 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:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Spotkanie"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:708
 #, 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:744
 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:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Uwierzytelnianie"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, 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:782
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:876
 #, 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:901
 #, 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:920
 #, 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:951
 #, 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:970
 #, 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:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:1024
 #, 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:1048
 #, 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:1067
 #, 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:1090
 #, 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:1109
 #, 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:97
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajt�w"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:114
 #, 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:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "za��cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:478
 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:509
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
@@ -5391,77 +5557,77 @@ msgstr "Za��cza plik do listu"
 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:328
 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:359
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:391
 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:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:395
 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:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:399
 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:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5470,7 +5636,7 @@ msgstr ""
 "Nie mo�na otworzy� pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5479,44 +5645,44 @@ 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:884
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:906
 #, 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:926
 #, 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:997
 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:1
+#: composer/e-msg-composer.c:1047
 #, 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:1055
 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:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5525,7 +5691,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:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5534,7 +5700,7 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5543,7 +5709,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5551,12 +5717,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:1
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5566,33 +5727,38 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Wstawienie pliku"
 
-#: composer/e-msg-composer.c:1 composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nie mo�na stworzy� okna tworzenia listu."
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr ""
 
@@ -5600,111 +5766,127 @@ msgstr ""
 msgid "address card"
 msgstr "karta adresowa"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "informacje kalendarza"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. 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:1
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:1
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:1 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 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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
-#: e-util/e-time-utils.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %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 "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: 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"
@@ -5713,7 +5895,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."
@@ -5721,7 +5903,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"
@@ -5732,68 +5914,73 @@ 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 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:712
 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
+#, fuzzy
+msgid "ago"
+msgstr " temu"
+
+#: filter/filter-datespec.c:709
 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:6
 msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
 #. and now for the action area
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Podejmowane czynno�ci"
 
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Dodaj czynno��"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:1 filter/vfolder-rule.c:1
-#: mail/mail-account-gui.c:1
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Wyb�r folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Podaj URI folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybra� folder> "
 
-#: filter/filter-input.c:1
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5802,317 +5989,324 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:1
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nazwa regu�y: "
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Lista warunk�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Wykonywanie czynno�ci"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "przy spe�nieniu wszystkich kryteri�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "poczta wchodz�ca"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "poczta wychodz�ca"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Dodaj"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Edycja"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Modyfikacja filtr�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolder�w"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Poczta wchodz�ca"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "Poczta wychodz�ca"
 
-#: filter/filter.glade.h:1 filter/vfolder-editor.c:1
+#: filter/filter.glade.h:10 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 ""
 
-#: 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 ""
 
-#: 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
-msgid "Forward to Address"
-msgstr "Prze�lij na adres"
-
-#: 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 ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: 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 ""
 
-#: filter/libfilter-i18n.h:1 mail/mail-callbacks.c:1
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 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:875
+#: 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:147
 msgid "Rules"
 msgstr "Regu�y"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:240
 msgid "Add Rule"
 msgstr "Dodaj regu��"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regu��"
 
-#: filter/score-editor.c:1
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: importers/elm-importer.c:1 importers/evolution-gnomecard-importer.c:1
-#: importers/netscape-importer.c:1 importers/pine-importer.c:1
-#: shell/e-shell-importer.c:1 shell/importer/import.glade.h:1
-#: shell/importer/intelligent.c:1
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1 my-evolution/my-evolution.glade.h:1
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Poczta"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6120,15 +6314,15 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Elm.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:1 importers/pine-importer.c:1
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Ksi��ka adresowa"
 
-#: importers/evolution-gnomecard-importer.c:1
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6136,11 +6330,11 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6148,7 +6342,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Netscape.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: 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?"
@@ -6156,7 +6350,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 mail"
 msgstr "Poczta Pine"
 
@@ -6164,179 +6358,194 @@ msgstr "Poczta 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 ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Factory for the Evolution mail component."
 msgstr "Generator komponentu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 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:9
 msgid "Mail configuration interface"
 msgstr "Interfejs konfiguracji poczty"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_W�a�ciwo�ci..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Zmienia w�a�ciwo�ci folderu"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/folder-browser.c:1 mail/mail-display.c:1
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, 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:893
 msgid "Store search as vFolder"
 msgstr "Zapisz wyszukiwanie jako vFolder"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1
-msgid "_Open"
-msgstr "_Otw�rz"
-
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Wy�lij ponownie"
 
-#: mail/folder-browser.c:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-message.xml.h:1 ui/evolution-tasks.xml.h:1
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Zapisz j_ako..."
 
-#: mail/folder-browser.c:1 ui/evolution-tasks.xml.h:1
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Odpowiedz nadawcy"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytany"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oz_nacz jako nieprzeczytany"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "Oznacz jako _wa�ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Oznacz jako _wa�ny"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Skopiuj do folderu..."
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Stw�rz _regu�� na podstawie listu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtr w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1482
 #, 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:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
@@ -6345,7 +6554,7 @@ msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
 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 "Impurtuje pliki mbox do Evolution."
 
@@ -6353,7 +6562,7 @@ msgstr "Impurtuje 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 "Impurtuje pliki Outlook Express 4 do Evolution."
 
@@ -6361,15 +6570,15 @@ msgstr "Impurtuje pliki Outlook Express 4 do Evolution."
 msgid "Current store format:"
 msgstr "Bie��cy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
 msgid "Mailbox Format"
 msgstr "Format skrzynki"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nowy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -6380,38 +6589,38 @@ 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:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:9
 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
 #, fuzzy
 msgid "Evolution News Editor"
 msgstr "Modyfikacja konta Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:1
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Zapisz podpis"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6421,56 +6630,66 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisa�?"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (domy�lne)"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
+#: mail/mail-accounts.c:264
 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:1
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Usu�"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Ustawienie jako konto domy�lne"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:1
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Mened�er kont Evolution"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest $s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "List on %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:285
 #, 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:356
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6478,13 +6697,13 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6492,11 +6711,11 @@ msgstr ""
 "Przed stworzeniem listu nale�y skonfigurowa�\n"
 "spos�b przekazywania list�w."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6504,7 +6723,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6512,37 +6731,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:359
 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:410
 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:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Przes�any list:\n"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1374
 #, 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:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6550,7 +6769,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:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6558,24 +6777,24 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1442
 #, 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:1463
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6584,24 +6803,24 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1966
 #, 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:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -6611,21 +6830,21 @@ msgstr ""
 "\"opcjonalne\" nie musz� by� wype�nione, chyba, �e chcesz, aby znajduj�ce "
 "si� w nich informacje by�y zawarte w wysy�anych listach."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:101
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:105
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:107
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -6635,11 +6854,11 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.c:1 mail/mail-config.c:1
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
@@ -6647,63 +6866,68 @@ 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
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Ten rodzaj szyfrowania nie obs�uguje podpisywania"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Zarz�dzanie kontami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:7
 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 ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w ka�dym przypadku"
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Za��cznik"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Typ uwierzytelniania: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automatyczne sprawdzanie nowych list�w co"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID certyfikatu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Nowe listy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6718,504 +6942,523 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Domy�lne"
 
-#: mail/mail-config.glade.h:1
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+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:27
 msgid "Default character set: "
 msgstr "Domy�lny zestaw znak�w: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Folder ze szkicami:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Edycja..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:37
 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:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Uaktywnij"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "Podpis w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Oznaczanie cytat�w za pomoc� koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Dane osobowe"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Tre�� listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:50
 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:51
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format skrzynki"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Ustawienie jako konto domy�lne"
 
-#: mail/mail-config.glade.h:1
-msgid "Mark messages as \"Read\" after"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Oznaczanie list�w jako \"przeczytanych\" po"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "Serwer NNTP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:59
 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:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizacja:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "�cie�ka programu PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:72
 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:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Potwierdzanie przy wysy�aniu listu bez tematu"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:86
 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:87
 msgid "Sending Email"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Wys�ane"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Folder z wys�anymi listami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Typ serwera:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Serwer wymaga uwierzytelnienia"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Plik z podpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "�r�d�o"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Informacje o �r�dle"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "�r�d�a"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Foldery specjalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Wykorzystanie bezpiecznego po��czenia (SSL)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "nazwa u�ytkownika:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:60
 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:86
 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:116
 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:142
 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:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Nie mo�na stworzy� kontekstu podpisu S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:240
 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:271
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:301
 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:221
 msgid "Save Attachment"
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Wy�wietl na miejscu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:399
 #, 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:403
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr "Zewn�trzna przegl�darka"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:1
-msgid "Save Image as"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
 msgstr "Zapisz obraz jako"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d new"
 msgstr "nowych: %d"
 
-#: mail/mail-folder-cache.c:1 mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:177
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "nowych: %d"
+
+#: mail/mail-folder-cache.c:188
 #, c-format
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:662
 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/message-list.etspec.h:1
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Adres e-mail:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Nie skonfigurowano programu GPG/PGP."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Nie wy�wietlono zaszyfrowanego listu"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "List zaszyfrowany"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kliknij ikon� aby rozszyfrowa�."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Wska�nik do witryny FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, 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:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otwieranie \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
-
-#: mail/mail-local.c:1
-msgid "Reconfiguring folder"
-msgstr "Przekonfigurowywanie folder"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:1
-msgid "Closing current folder"
-msgstr "Zamykanie bie��cego folderu"
-
-#: mail/mail-local.c:1
-msgid "Renaming old folder and opening"
-msgstr "Zmiana nazwy starego folderu i otwieranie"
-
-#: mail/mail-local.c:1
-msgid "Creating new folder"
-msgstr "Tworzenie nowego folderu"
-
-#: mail/mail-local.c:1
-msgid "Copying messages"
-msgstr "Kopiowanie list�w"
-
-#: mail/mail-local.c:1
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nie mo�na kopiowa� list�w z tego folderu �mietnka."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Zmiana konfiguracji %s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7224,7 +7467,7 @@ msgstr ""
 "B��d podczas operacji \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7233,110 +7476,104 @@ msgstr ""
 "B��d przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:1 mail/mail-mt.c:1 mail/mail-mt.c:1
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-mt.c:1
-msgid "Evolution progress"
-msgstr "Post�p Evolution"
-
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysy�anie \"%s\""
 
-#: mail/mail-ops.c:1
-msgid "Sending message"
-msgstr "Wysy�anie listu"
-
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysy�anie %d. listu z %d"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:717
 #, 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:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Aanlizowanie folder�w w \"%s\""
 
-#: mail/mail-ops.c:1
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "�mietnik"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Pobieranie list�w"
 
-#: mail/mail-ops.c:1
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Pobieranie %d. listu z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie list�w"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7345,12 +7582,7 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Zapisywanie %d. listu z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7359,11 +7591,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7372,215 +7604,218 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(List bez nazwy)"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(List bez nazwy)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "List"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Wyszukiwanie w li�cie"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Z rozr�nianiem ma�ych i wielkich liter"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Wyszukiwanie w prz�d"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Znajd�:"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:335
 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:250
 msgid "Send & Receive mail"
 msgstr "Wy�lij i odbierz poczt�"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Odbieranie"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:1 mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Wysy�anie"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:1
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (przes�any list)"
-
-#: mail/mail-tools.c:1
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (bez tematu)"
-
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Przes�any list - %s"
 
-#: mail/mail-tools.c:1
-msgid "Forwarded message (no subject)"
-msgstr "Przes�any list (bez tematu)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Przes�ane listy"
 
-#: mail/mail-tools.c:1
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Przes�any list-----<br><b>Od:</b> %s<br><b>Do:</b> %s<br><b>Temat:</b> "
-"%s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Przes�ane listy"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Wysoko��:"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Wysoko��:"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Dzi� %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Zapisywanie list�w"
+
+#: 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 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Folder"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Wy�wietlanie folder�w rozpoczynaj�cych si� od:"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Zapisywanie list�w z folderu \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Opis:"
@@ -7589,210 +7824,186 @@ msgstr "Opis:"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: my-evolution/component-factory.c:1
+#: my-evolution/component-factory.c:140
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: my-evolution/e-summary-calendar.c:1 my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Terminy"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Brak termin�w"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:226
 msgid "%l:%M%p"
 msgstr "%l:%M%p"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:228
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:1
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Dodaj �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:877
 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-rdf.c:1 my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "_Ustawienia Mojego Evolution..."
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>B��d przy pobieraniu RDF-a</b>"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:206
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: my-evolution/e-summary-weather.c:1
-msgid "<b>Error downloading Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "Regiony"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:145
 msgid "%A, %d %B %Y"
 msgstr "%A, %d %B %Y"
 
-#: my-evolution/e-summary.c:1 ui/my-evolution.xml.h:1
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Drukowanie Mojego Evolution"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "Wydrukowanie Mojego Evolution nie powiod�o si�"
 
-#: my-evolution/main.c:1
+#: my-evolution/main.c:52
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 
-#: my-evolution/metar.c:1
-msgid "�F"
-msgstr "�F"
-
-#: my-evolution/metar.c:1
-msgid "�C"
-msgstr "�C"
-
-#: my-evolution/metar.c:1
-msgid "knots"
-msgstr ""
-
-#: my-evolution/metar.c:1
-msgid "kph"
-msgstr "km/h"
-
-# [cyba] mo�e raczej calHg??
-#: my-evolution/metar.c:1
-msgid "inHg"
-msgstr "inHG"
-
-#: my-evolution/metar.c:1
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:1
-msgid "miles"
-msgstr "mile"
-
-#: my-evolution/metar.c:1
-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 "Niepewne 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 ""
 
-#: 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:137
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr ""
 
-#: 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"
 
@@ -7800,1173 +8011,1161 @@ msgstr "P�noc - p�nocny zach�d"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "M�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Nadchodz�ca m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "�agodna m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Umiarkowana m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "Obfita m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "S�aba m�awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr "Cz�ciowa m�awka"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "Deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Nadchodz�cy deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "�agodny deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Umiarkowany deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "Obfity deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "S�aby deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "�nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Nadchodz�cy �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "�agodny �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Umiarkowany �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "Obfity �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "S�aby �nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hail"
 msgstr "Grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr "Nadchodz�cy grad"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr "�agodny grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr "Umiarkowany grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr "Obfity grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr "S�aby grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Partial hail"
 msgstr "Cz�ciowy grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr "Gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr "Nadchodz�cy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr "Umiarkowany gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr "Obfity gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Shallow small hail"
 msgstr "S�aby gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr "Cz�ciowy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr "Nieznane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr "Nadchodz�ce opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr "�agodne opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr "Umiarkowane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr "Obfite opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr "S�abe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr "Cz�ciowe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Nadchodz�ca mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "�agodna mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Umiarkowana mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr "S�aba mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "Cz�ciowa mgie�ka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr "Mgie�ka z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr "Mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr "Nadchodz�ca mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr "�agodna mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr "Umiarkowana mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Shallow fog"
 msgstr "S�aba mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr "Cz�ciowa mg�a"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Fog with wind"
 msgstr "Mg�a z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke"
 msgstr "Dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr "Nadchodz�cy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr "Umiarkowany dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Shallow smoke"
 msgstr "S�aby dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr "Cz�ciowy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke with wind"
 msgstr "Dym z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Nadchodz�ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Umiarkowane tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr "Cz�ciowe tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add ->"
-msgstr "Dodaj ->"
-
-#: my-evolution/my-evolution.glade.h:1
 msgid "Add new feed"
 msgstr "Dodaj �r�d�o"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:2
 msgid "All folders:"
 msgstr "Wszystkie foldery:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:3
 msgid "All news feeds:"
 msgstr "Wszystkie �r�d�a nowo�ci:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:4
 msgid "All stations:"
 msgstr "Wszystkie stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:6
 msgid "Display folders:"
 msgstr "Wy�wietlane foldery"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:7
 msgid "Display stations:"
 msgstr "Wy�wietlane stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:8
 msgid "Displayed feeds:"
 msgstr "Wy�wietlane �r�d�a:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:9
 msgid "Five days"
 msgstr "Pi�� dni"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:10
 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:12
 msgid "Max number of items shown:"
 msgstr "Maksymalna liczba wy�wietlanych element�w:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:13
 msgid "News Feed Settings"
 msgstr "Ustawienia �r�de� nowinek"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:14
 msgid "News Feeds"
 msgstr "�r�d�a nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:15
 msgid "One day"
 msgstr "Jeden dzie�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:16
 msgid "One month"
 msgstr "Jeden miesi�c"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:17
 msgid "One week"
 msgstr "Jeden tydzie�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:18
 msgid "Refresh time (seconds):"
 msgstr "Okres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "Remove <-"
-msgstr "Usu� <-"
-
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:19
 msgid "Schedule"
 msgstr "Planowanie"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:20
 msgid "Show all tasks"
 msgstr "Wy�wietlanie wszystkich zada�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:21
 msgid "Show 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:22
 msgid "Show today's tasks"
 msgstr "Wy�wietlanie dzisiejszych zada�"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:23
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:24
 msgid "Units: "
 msgstr "Jednostki: "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:25
 msgid "Weather"
 msgstr "Pogoda"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:26
 msgid "Weather settings"
 msgstr "Ustawienia pogody"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "Wipe trackers"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:27
 msgid "imperial"
 msgstr "imperialne"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metryczne"
 
@@ -8974,19 +9173,24 @@ msgstr "metryczne"
 msgid "The Evolution shell."
 msgstr "Pow�oka Evolution."
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:198
 msgid "Show Details"
 msgstr "Wy�wietl szczeg�y"
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:200
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
-#: shell/e-setup.c:1 shell/e-setup.c:1
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Foldery specjalne"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -8994,23 +9198,23 @@ 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:130
 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:170
 msgid "Could not update files correctly"
 msgstr "Nie mo�na poprawnie uaktualni� plik�w"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Wygl�da na to, �e Evolution zosta�o uruchomione po raz pierwszy."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Kliknij \"OK\", aby zainstalowa� pliki u�ytkownika Evolution w"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9021,7 +9225,7 @@ msgstr ""
 "%s\n"
 "B��d: %s"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -9030,7 +9234,7 @@ msgstr ""
 "Wyst�pi� b��d przy kopiowaniu plik�w do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9041,7 +9245,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:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9054,7 +9258,7 @@ msgstr ""
 "jego usuni�cie.\n"
 "Czy chcesz usun�� ten katalog?"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9065,52 +9269,52 @@ msgstr ""
 "Evolution. Przenie� go w inne miejsce, aby umo�liwi�\n"
 "instalacj� plik�w u�ytkownika Evolution."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:160
 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:162
 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:176
 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:270
 #, 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:275
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:313
 #, 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:318
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Usuni�cie folderu \"%s\""
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:363
 #, 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:422
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Zmiana nazwy folderu \"%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"
@@ -9119,15 +9323,15 @@ msgstr ""
 "Nie mo�na stworzy� podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Podana nazwa folderu nie jest poprawna."
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:275
 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."
@@ -9135,15 +9339,15 @@ 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:343
 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:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:97
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -9154,7 +9358,7 @@ msgstr ""
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:192
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9165,7 +9369,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:212 shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9174,18 +9378,18 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -9194,17 +9398,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d odczycie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9213,47 +9417,47 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:1 shell/importer/import.glade.h:1
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:600
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do kt�rego powinny zosta� zaimportowane te dane"
 
-#: shell/e-shell-offline-handler.c:1
+#: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "Zamykanie po��cze�..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:181
 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:189
 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:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9269,71 +9473,73 @@ msgstr ""
 "prosimy wysy�a� na adres:\n"
 "translators@gnome.pl"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Przej�cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:438
 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:583
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:584
 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
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Praca z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:1 shell/e-shell-view-menu.c:1
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1 shell/e-storage-set-view.c:1
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 msgid "My Evolution"
 msgstr "Moje Evolution"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "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:1458
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution przechodzi obecnie w tryb bez pod��czenia do sieci."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "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:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego pojemnika -- %s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -9342,15 +9548,15 @@ msgstr ""
 "Widok \"%s\" nieoczekiwanie zako�czy� dzia�anie. :-(\n"
 "Prawdopodobnie oznacza to b��d komponentu %s."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9359,165 +9565,168 @@ 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:272
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:301
 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:314
 msgid "_Small Icons"
 msgstr "_Ma�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:315
 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:317
 msgid "_Large Icons"
 msgstr "_Du�e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:318
 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:329
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Tworzy now� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "_Usu� grup�..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Usuwa t� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "_Zmie� nazw� grupy..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazw� grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skr�tu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Zmie� nazw� wybranego skr�tu na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Otw�rz"
+
+#: shell/e-shortcuts-view.c:474
 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:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otw�rz w nowym oknie"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:476
 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:479
 msgid "Rename"
 msgstr "Zmie� nazw�"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Zmienia nazw� skr�tu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:481
 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:585
 msgid "Error saving shortcuts."
 msgstr "B��d przy zapisywaniu skr�t�w."
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "Nades�ane"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:987
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:479
 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:481
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na stworzenie folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:1
-#, c-format
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (zako�czono %d%)"
 
@@ -9525,17 +9734,17 @@ msgstr "%s (zako�czono %d%)"
 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:"
 
@@ -9543,11 +9752,11 @@ 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:"
 
@@ -9555,38 +9764,38 @@ msgstr "Okre�l miejsce stworzenia folderu:"
 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 Utility"
 msgstr "Evolution - narz�dzie importuj�ce"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:3
 msgid "Evolution Importer Utility"
 msgstr "Evolution - narz�dzie importuj�ce"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:6
 msgid ""
 "Welcome to the Evolution Import Utility.\n"
 "With this wizard you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importery"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:197
 msgid "Don't import"
 msgstr "Nie importuj"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Nie pytaj o to ponownie"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:209
 msgid "Evolution has found the following data sources:"
 msgstr "Odnaleziono nast�puj�ce �r�d�a danych:"
 
-#: shell/main.c:1
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9615,7 +9824,7 @@ msgstr ""
 "Mamy nadziej�, �e Evolution b�dzie dla Ciebie przydatn� aplikacj�\n"
 "i niecierpliwie oczekujemy Twoich komentarzy oraz pomocy!\n"
 
-#: shell/main.c:1
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9623,417 +9832,365 @@ msgstr ""
 "Dzi�kujemy\n"
 "Zesp� tw�rc�w Evolution\n"
 
-#: shell/main.c:1
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Evolution."
 
-#: shell/main.c:1
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:1
+#: shell/main.c:216
 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:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo�na zainicjowa� systemu komponent�w Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "_Wytnij"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+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-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Wytnij"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 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:10
 msgid "New contact"
 msgstr "Nowy Kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:11
 msgid "New list"
 msgstr "Nowa lista"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Wklej"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto�� schowka"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:14
 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:17
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:19
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "�r�d�a ksi��ki adresowej..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:24
 msgid "_Contact Group"
 msgstr "Grupa _kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "_Copy"
-msgstr "S_kopiuj"
-
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "_Paste"
-msgstr "Wk_lej"
-
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/my-evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Szukaj kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "Zaznacz _wszystko"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Narz�dzia"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dni"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Alter preferences"
-msgstr "Pozwala na zmian� ustawie�"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Tworzy nowe zdarzenie ca�odniowe"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Tworzy nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new calendar"
-msgstr "Tworzy nowy termianrz"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Tworzy nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Day"
-msgstr "Dzie�"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Przejd� do"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Przemieszcza w czasie wstecz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Przemieszcza w czasie naprz�d"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Przejd� do _daty"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Go to _Today"
-msgstr "Przejd� do d_zisiaj"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Przemieszcza do bie��cego czasu"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Month"
-msgstr "Miesi�c"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "New _Event"
-msgstr "Nowe _zdarzenie"
-
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-message.xml.h:1
-msgid "Next"
-msgstr "Nast�pny"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Open Calendar"
-msgstr "Otw�rz kalendarz"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Prev"
-msgstr "Poprzedni"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:18
 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-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Wydrukuj kalendarz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Drukuje zawarto�� kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "Wymagane informacje"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-message-composer.xml.h:1
-msgid "Save As"
-msgstr "Zapisz jako"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Save calendar as something else"
-msgstr "Zapisuje kalendarz w innej formie"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Settings..."
-msgstr "Ustawienia..."
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Wy�wietla jeden dzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Wy�wietla jeden miesi�c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Wy�wietla jeden tydzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Wy�wietla tydzie� roboczy"
 
-#: ui/evolution-calendar.xml.h:1 widgets/misc/e-cell-date-edit.c:1
-#: widgets/misc/e-dateedit.c:1
-msgid "Today"
-msgstr "Dzi�"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Tydzie� _roboczy"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Week"
-msgstr "Tydzie�"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Terminy"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Ustawienia poczty..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Dzie�"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Miesi�c"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution.xml.h:1
-msgid "_New"
-msgstr "_Nowy"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "_Open Calendar"
-msgstr "_Otw�rz kalendarz"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Tydzie�"
 
-#: 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 appointment"
 msgstr "Zamyka termin"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:5
 msgid "Delete this appointment"
 msgstr "Usuwa termin"
 
-#: 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:6
+#: ui/evolution.xml.h:21
 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-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Podgl�d wy_druku"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print S_etup"
 msgstr "U_stawienia wydruku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:12 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-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Zapisz i zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save the appointment and close the dialog box"
 msgstr "Zapisuje termin i zamyka okno"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:17
 msgid "Save this item to disk"
 msgstr "Zapisuje bie��cy element na dysku"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:18
 msgid "Setup the page settings for your current printer"
 msgstr "Ustala ustawienia strony bie��cej drukarki"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:19
 msgid "_Action"
 msgstr "_Czynno��"
 
-#: 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:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Plik"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:1
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Usuwa bie��cy element"
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Usu�..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Pomoc"
 
-#: 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:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: 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:10
 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-editor.xml.h:11
 msgid "Se_nd contact to other..."
 msgstr "_Wy�lij kontakt do innej osoby..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Wy�lij _list do kontaktu..."
 
-#: 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:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: 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:2
 msgid "Delete this list"
 msgstr "Usuwa t� list�"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:6
 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:7
 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:8
 msgid "Send _message to list..."
 msgstr "Wy�lij _list do listy..."
 
@@ -10041,36 +10198,36 @@ msgstr "Wy�lij _list do listy..."
 msgid "Cancel Mee_ting"
 msgstr "Anuluj _spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-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:4
 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:5
 msgid "Forward this item via email"
 msgstr "Prze�lij ten element w li�cie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: 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-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Zaplanuj spotkanie zwi�zane z tym elementem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-task-editor.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "C_zynno�ci"
 
@@ -10082,88 +10239,93 @@ msgstr "Dopasuj Moje Evolution"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: 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"
 msgstr "Nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Tworzenie listu"
+
+#: ui/evolution-mail-global.xml.h:5
 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:6
 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:7
 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:8
 msgid "Empty _Trash"
 msgstr "Opr�nij �mie_tnik"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Zapomnij _has�a"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:10
 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:11
 msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:12
 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:13
 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:14
 msgid "Send / Receive"
 msgstr "Wy�lij / Odbierz"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:15
 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:16
 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:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:18
 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 "_List"
 
-#: 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"
 
@@ -10171,106 +10333,107 @@ msgstr "_Wy�lij / Odbierz"
 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:3
 msgid "Copy selected messages"
 msgstr "Kopiuje zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:5
 msgid "Cut selected messages"
 msgstr "Wycina zaznaczone listy do schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide S_elected Messages"
 msgstr "Ukrycie _zaznaczonych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Deleted Messages"
 msgstr "Ukrycie _usuni�tych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
-msgid "Hide _Read messages"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Ukrywanie prz_eczytanych list�w"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:9
 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:10
 msgid "Mark All as R_ead"
 msgstr "Oznacz wszystkie jako przeczy_tane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:11
 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:13
 msgid "Paste message in the clipboard"
 msgstr "Wkleja list ze schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:14
 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:15 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:16
 msgid "Select _Thread"
 msgstr "Zaznacz _w�tek"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:17
 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:18
 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:19
 msgid "Select all visible messages"
 msgstr "Zaznacza wszystkie widoczne listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:20
 msgid "Show _All"
 msgstr "Wy�wietl _wszystkie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:21
 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:22
 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:23
 msgid "Temporarily hide the selected messages"
 msgstr "Czasowo ukrywa zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:24
 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:25
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:27 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:28
 msgid "_Properties..."
 msgstr "_W�a�ciwo�ci..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Threaded Message List"
 msgstr "Grupowanie list�w w w�t_ki"
 
@@ -10278,337 +10441,380 @@ 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:17
 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:18
 msgid "Display the next message"
 msgstr "Wy�wietla kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:19
 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:20
 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:21
 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:22
 msgid "Display the previous message"
 msgstr "Wy�wietla poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "Wy�wietla poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtr w oparciu o t_emat"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:28
 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:29
 msgid "Forward"
 msgstr "Prze�lij"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Prze�lij jako"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Prze�lij _za��czony"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Prze�lij _wstawiony"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Prze�lij z_acytowany"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:34
 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:35
 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:36
 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:37
 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:39
 msgid "Load _Images"
 msgstr "Pobierz _obrazy"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Mar_k As Read"
-msgstr "Oznacz jako p_rzeczytane"
-
-#: ui/evolution-mail-message.xml.h:1
-msgid "Mark As I_mportant"
-msgstr "Oznacz jako wa�n_e"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Oznacz jako _wa�ny"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Mark As U_nread"
-msgstr "Oznacz jako _nieprzeczytane"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Oznacz jako _wa�ny"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:44
 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:45
 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:46
 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:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Oznacza zaznaczone listy jako wa�ne"
+
+#: ui/evolution-mail-message.xml.h:48
 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:49
 msgid "Move"
 msgstr "Przenie�"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:50
 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:51
+msgid "Next"
+msgstr "Nast�pny"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Wy�wietla kolejny wa�ny list"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "List"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Zaznacz _w�tek"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "(List bez nazwy)"
+
+#: ui/evolution-mail-message.xml.h:56
 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:57
 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:58
 msgid "Previews 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:59
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Wy�wietla poprzedni wa�ny list"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Wydruk listu"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Wy�wietla poprzedni nieprzeczytany list"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Wydrukuj list..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Podgl�d wydruku..."
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Print message to the printer"
-msgstr "Drukuje list na drukarce"
-
-#: ui/evolution-mail-message.xml.h:1
-msgid "Redirect (FIXME: implement me)"
-msgstr "Przekieruj (FIXME)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Wydruk listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_Przeszukaj list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:72
 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:73
 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:74
 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:75
 msgid "Show Full _Headers"
 msgstr "Wy�wietlanie wszystkich _nag��wk�w"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:76
 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:77
 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:78
 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:79
 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:80
 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:81
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawc�..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Zastosuj filtry"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:86
 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:88
 msgid "_Forward Message"
 msgstr "_Prze�lij list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Wy�wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "P_rzenie� do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Zwyk�e wy�wietlanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Otw�rz list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Wy�lij list pono_wnie"
 
-#: 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.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
 msgstr "_Dopasuj paski narz�dziowe..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 msgid "Customize"
 msgstr "Dopasuj"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
 msgid "Customize toolbars"
 msgstr "Pozwala na dopasowanie pask�w narz�dziowych"
 
-#: 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:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 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:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 msgid "_View"
 msgstr "_Widok"
 
@@ -10616,215 +10822,225 @@ 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 "F_ormat"
 msgstr "_Format"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Wstaw plik tekstowy.."
+
+#: 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-signature-editor.xml.h:1 widgets/misc/e-filter-bar.c:1
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Zapisz"
 
-#: 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: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:4
 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
-msgid "_Attachment"
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+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-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "�ledzenie przebiegu _wykonania"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Usu� wszystko"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:50
 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:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Wstaw"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "_Insert text file..."
-msgstr "_Wstaw plik tekstowy.."
-
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Otw�rz..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Pole _Odpowied� do"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Bezpiecze�stwo"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Pomo_c"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 
@@ -10832,51 +11048,52 @@ msgstr "Wypisz"
 msgid "Cancel Task"
 msgstr "Anuluj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:3
 msgid "Delegate Task"
 msgstr "Oddeleguj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:7
 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 ""
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Wycina zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Usuwa zaznaczone zadanie"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Wkleja zadanie ze schowka"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Zapisuje zadanie w innej formie"
 
-#: ui/evolution-tasks.xml.h:1
-msgid "Set task view preferences"
-msgstr "Ustawienia widoku zadania"
-
-#: ui/evolution-tasks.xml.h:1
-msgid "Tasks Preferences..."
-msgstr "Ustawienia zadania..."
-
-#: ui/evolution-tasks.xml.h:1
-msgid "TasksPreferences"
-msgstr "UstawieniaZadania"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Ustawienia poczty..."
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Zadanie"
 
@@ -10884,188 +11101,188 @@ msgstr "_Zadanie"
 msgid "About Evolution..."
 msgstr "Informacje o 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:13
 msgid "Delete this folder"
 msgstr "Usuwa folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Wy�wietla inny folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Zako�cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Ko�czy prac� programu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Pi_erwsze kroki"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importuje zewn�trzny plik w wybranym formacie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otw�rz w nowym _oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Wy�wietla informacje o Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:29
 msgid "Submit 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:30
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:31
 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:32
 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:33
 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:34
 msgid "Using the C_ontact Manager"
 msgstr "Korzystanie z _mened�era kontakt�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Korzystanie z _kalendarza"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Korzystanie z programu p_ocztowego"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:1
-msgid "Work Offline"
-msgstr "Praca bez pod��czenia"
-
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Informacje o Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Termin (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Pasek _folder�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Za_importuj plik..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "I_ndeks"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_List e-mail"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nowy"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_Skr�t"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Zadanie (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
@@ -11073,7 +11290,7 @@ msgstr "Praca _bez pod��czenia"
 msgid "Change the settings for My Evolution"
 msgstr "Zmienia ustawienia Mojego Evolution"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:4
 msgid "_My Evolution Settings..."
 msgstr "_Ustawienia Mojego Evolution..."
 
@@ -11081,11 +11298,11 @@ msgstr "_Ustawienia Mojego Evolution..."
 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"
 
@@ -11093,256 +11310,256 @@ 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"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Zaj�ty"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Zapro� innych..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Opcje"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Wy�wietlanie _tylko godzin roboczych"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zas�b"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "_Wymagani ludzie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zas�b"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz�tku spotkania:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Wszyscy uczestnicy"
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Bie��cy widok"
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:259
 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:428
 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:1
-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:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Dzi�"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Czas musi by� podany w formacie: %s"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Ba�tycki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "�rodkowoeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Chi�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japo�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korea�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Turecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Zachodnioeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:85
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: widgets/misc/e-charset-picker.c:1 widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
 msgstr "Uproszczony"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:91
 msgid "Ukrainian"
 msgstr "Ukrai�ski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:102
 msgid "New"
 msgstr "Nowy"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:160
 #, 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:202
 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:277
 msgid "Other..."
 msgstr "Inny..."
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
 msgstr "Standard kodowania znak�w"
 
-#: widgets/misc/e-clipped-label.c:1
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Edytor kontakt�w"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Wy�wietl wszystkie"
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: 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:159
 msgid "Warning"
 msgstr "Ostrze�enie"
 
-#: 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:155
 msgid "Sear_ch"
 msgstr "_Wyszukiwanie"
 
@@ -11350,18 +11567,194 @@ msgstr "_Wyszukiwanie"
 msgid "The Personal Addressbook Server"
 msgstr "Osobisty serwer ksi��ki adresowej"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#: wombat/GNOME_Evolution_Wombat.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:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nie mo�na zainicjowa� GNOME-VFS"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Ustawienia widoku zadania"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "UstawieniaZadania"
+
+#~ msgid "(none)"
+#~ msgstr "(brak)"
+
+#~ msgid "File not found"
+#~ msgstr "Nie odnaleziono pliku"
+
+#~ msgid "Open calendar"
+#~ msgstr "Otw�rz kalendarz"
+
+#~ msgid "Save calendar"
+#~ msgstr "Zapisz kalendarz"
+
+#~ msgid "Edit this task"
+#~ msgstr "Zredaguj zadanie"
+
+#~ msgid "Go to Today"
+#~ msgstr "Przejd� do dzisiaj"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Usu� wszystkie wyst�pienia"
+
+#~ msgid "Summary contains"
+#~ msgstr "Zestawienie zawiera"
+
+#~ msgid "Description contains"
+#~ msgstr "Opis zawiera"
+
+#~ msgid "Comment contains"
+#~ msgstr "Komentarz zawiera"
+
+#~ msgid "Has category"
+#~ msgstr "Ma kategori�"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Skanowanie folderu IMAP"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Prze�lij na adres"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Przekonfigurowywanie folder"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Zamykanie bie��cego folderu"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Zmiana nazwy starego folderu i otwieranie"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Tworzenie nowego folderu"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopiowanie list�w"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Post�p Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Pobieranie %d. listu z %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Zapisywanie %d. listu z %d (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (przes�any list)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (bez tematu)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Przes�any list (bez tematu)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Przes�any list-----<br><b>Od:</b> %s<br><b>Do:</b> %s<br><b>Temat:</b> "
+#~ "%s<br>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ msgid "�C"
+#~ msgstr "�C"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+# [cyba] mo�e raczej calHg??
+#~ msgid "inHg"
+#~ msgstr "inHG"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "mile"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometry"
+
+#~ msgid "Add ->"
+#~ msgstr "Dodaj ->"
+
+#~ msgid "Remove <-"
+#~ msgstr "Usu� <-"
+
+#~ msgid "Work offline"
+#~ msgstr "Praca bez pod��czenia"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Pozwala na zmian� ustawie�"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Tworzy nowy termianrz"
+
+#~ msgid "Day"
+#~ msgstr "Dzie�"
+
+#~ msgid "Month"
+#~ msgstr "Miesi�c"
+
+#~ msgid "New _Event"
+#~ msgstr "Nowe _zdarzenie"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Otw�rz kalendarz"
+
+#~ msgid "Prev"
+#~ msgstr "Poprzedni"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Zapisuje kalendarz w innej formie"
+
+#~ msgid "Settings..."
+#~ msgstr "Ustawienia..."
+
+#~ msgid "Week"
+#~ msgstr "Tydzie�"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Otw�rz kalendarz"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Oznacz jako p_rzeczytane"
+
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Oznacz jako wa�n_e"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oznacz jako _nieprzeczytane"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Drukuje list na drukarce"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Przekieruj (FIXME)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Wstaw plik tekstowy.."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Ustawienia zadania..."
diff --git a/po/pt.po b/po/pt.po
index d807b4803a..47cde15dd0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Tiago Ant�o <tiagoantao@bigfoot.com>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago Ant�o <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -14,370 +13,210 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "N�o se consegui inicializar Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Enviar a mensagem"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Enviar"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Cores"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Ir para a _pasta..."
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Ir para o item anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Ir para o pr�ximo item"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Nova pasta"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "N�o consigo abrir a localiza��o: %s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erro a gravar os atalhos."
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Novo"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Criar um novo contacto"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Component de correio: N�o consegui inicializar Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Carro"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Endere�o"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -393,730 +232,1339 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+msgid "Could not initialize Bonobo"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: addressbook/conduit/address-conduit.c:201
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
+#: addressbook/conduit/address-conduit.c:214
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
+msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
+#, fuzzy
+msgid "Could not start wombat"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Atalho para _barra do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Evolution component for handling contacts."
+msgstr "Uma pasta contendo contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Pressione aqui para o livro de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:148
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:150
+#, fuzzy
+msgid "File"
+msgstr "_Pasta"
+
+#: addressbook/gui/component/addressbook-config.c:153
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Password"
+msgstr "Esquecer _Senhas"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+#: addressbook/gui/component/addressbook-config.c:177
 #, fuzzy
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998 Free Software Foundation"
+msgid "Base"
+msgstr "Colar"
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "Fontes"
 
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
+msgid "Host:"
+msgstr "Horas"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
-"Um excep��o ocorreu enquanto se tentava carregar dados no componente com "
-"PersistStream"
 
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/gui/component/addressbook-config.c:432
 #, fuzzy
-msgid "Could not start wombat"
-msgstr "N�o se consegui inicializar Bonobo"
+msgid "Search Scope:"
+msgstr "Ano"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentica��o"
+
+#: addressbook/gui/component/addressbook-config.c:501
+#, fuzzy
+msgid "Advanced LDAP Options"
+msgstr "Encontrar avan�ado"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Caminho"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:663
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:665
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+#, fuzzy
+msgid "Description:"
+msgstr "Nenhuma descri��o"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Adicionar Fonte"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Apagar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#, fuzzy
+msgid "Name"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 #, fuzzy
-msgid "_Delete"
-msgstr "Apagar"
+msgid "_Edit"
+msgstr "Editar..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-storage.c:118
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: addressbook/gui/component/addressbook.c:380
+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/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Adicionar"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/gui/component/addressbook.c:554
 #, fuzzy
-msgid "Contact Editor"
-msgstr "_Contacto"
+msgid "Any field contains"
+msgstr "Uma pasta contendo tarefas"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
+#: addressbook/gui/component/addressbook.c:556
 #, fuzzy
-msgid "_Full Name..."
-msgstr "Nome completo:"
+msgid "Email contains"
+msgstr "�cone_s pequenos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "�cone_s pequenos"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "O URI que o navegador de pastas mostrar�"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Endere�o principal de correio electr�nico"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Correio electr�nico 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Correio electr�nico 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Apagar um contacto"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar um novo contacto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
+#: addressbook/gui/component/e-address-popup.c:859
 #, fuzzy
-msgid "Web page address:"
+msgid "Querying Addressbook..."
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
 msgstr "Endere�o de correio:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Remover"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
 #, fuzzy
-msgid "_Home"
-msgstr "Casa"
+msgid "Remove All"
+msgstr "Remover"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Enviar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
-msgid "_Mobile"
-msgstr "Telem�vel"
+msgid "Message Recipients"
+msgstr "Situa��o das mensagens"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Endere�o principal de correio electr�nico"
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Select Names"
+msgstr "_Items seleccionados"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "_Items seleccionados"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Ano"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
-msgid "C_ontacts..."
+msgid "Contact Editor"
 msgstr "_Contacto"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 #, fuzzy
-msgid "_Company:"
-msgstr "Empresa"
+msgid "No_tes:"
+msgstr "_Nota"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organiza��o:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Web page address:"
+msgstr "Endere�o de correio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Address..."
 msgstr "Endere�o"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_Contacto"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Delete"
+msgstr "Apagar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "_Full Name..."
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Home"
+msgstr "Casa"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "_Mobile"
+msgstr "Telem�vel"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
+msgid "Delete Contact?"
+msgstr "Apagar um contacto"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Telem�vel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Bip"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Prim�rio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#, fuzzy
+msgid "Edit Full"
+msgstr "_Pastas"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
+msgid "E-mail"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "Correio electr�nico 3"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#, fuzzy
+msgid "Address _2:"
+msgstr "Endere�o"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Canada"
+msgstr "Novo Ca_lend�rio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#, fuzzy
+msgid "Check Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#, fuzzy
+msgid "Finland"
+msgstr "Encontrar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#, fuzzy
+msgid "_Address:"
+msgstr "Endere�o"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 #, fuzzy
 msgid "Check Full Name"
 msgstr "Nome completo:"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 #, fuzzy
 msgid "_First:"
 msgstr "_Pasta"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 #, fuzzy
 msgid "_Middle:"
 msgstr "_Correio"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Utilizador:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "Como _Tabela"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "Imposs�vel abrir o livro de endere�os"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Remover"
 
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "_Contacto"
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "_Contacto"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Advanced..."
-msgstr "Adicionar..."
+msgid "New Contact:"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Any field contains"
-msgstr "Uma pasta contendo tarefas"
+msgid "Original Contact:"
+msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
+#: 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?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Email contains"
-msgstr "�cone_s pequenos"
+msgid "Changed Contact:"
+msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que o navegador de pastas mostrar�"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 #, fuzzy
-msgid "Other Contacts"
-msgstr "_Novo Contacto"
+msgid "Search"
+msgstr "Ano"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
 #, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor:"
+msgid "a"
+msgstr "am"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/widgets/alphabet.glade.h:3
 #, fuzzy
-msgid "File"
-msgstr "_Pasta"
+msgid "b"
+msgstr "%b"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/widgets/alphabet.glade.h:4
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "Imposs�vel abrir o livro de endere�os"
+msgid "c"
+msgstr "Cc"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: addressbook/gui/widgets/alphabet.glade.h:6
 #, fuzzy
-msgid "Password"
-msgstr "Esquecer _Senhas"
+msgid "e"
+msgstr "Qa"
 
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Colar"
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr "h"
 
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/widgets/alphabet.glade.h:12
 #, fuzzy
-msgid "Subtree"
-msgstr "Fontes"
+msgid "k"
+msgstr "Ok"
 
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
+#: addressbook/gui/widgets/alphabet.glade.h:14
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+#, fuzzy
+msgid "n"
+msgstr "Seg"
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+#, fuzzy
+msgid "o"
+msgstr "Para"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
+#: addressbook/gui/widgets/alphabet.glade.h:19
+#, fuzzy
+msgid "r"
+msgstr "Sx"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/widgets/alphabet.glade.h:21
 #, fuzzy
-msgid "Host:"
-msgstr "Horas"
+msgid "t"
+msgstr "h"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/widgets/alphabet.glade.h:22
 #, fuzzy
-msgid "Port:"
-msgstr "Prioridade:"
+msgid "u"
+msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+msgid "x"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+msgid "y"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
+msgid "Save as VCard"
+msgstr "Gravar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
-msgid "Search Scope:"
-msgstr "Ano"
+msgid "Send message to contact"
+msgstr "Enviar mensagem em formato HTML"
 
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "Autentica��o"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "Imprimir"
 
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Caminho"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimir..."
 
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "Imposs�vel abrir o livro de endere�os"
+msgid "Success"
+msgstr "Fontes"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "Imposs�vel abrir o livro de endere�os"
+msgid "Card not found"
+msgstr "Ficheiro n�o encontrado"
 
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
-msgid "Name:"
-msgstr "Nome"
+msgid "Canceled"
+msgstr "Novo Ca_lend�rio"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
-msgid "Description:"
-msgstr "Nenhuma descri��o"
+msgid "Other error"
+msgstr "Outro"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #, fuzzy
-msgid "Search"
-msgstr "Ano"
+msgid "Error adding list"
+msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Gravar como VCard"
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
-msgid "Name"
-msgstr "Nome"
+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:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Erro a gravar os atalhos."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+#, fuzzy
+msgid "File As"
+msgstr "_Pasta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Prim�rio"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+#, fuzzy
+msgid "Home Phone"
+msgstr "Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organiza��o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+#, fuzzy
+msgid "Home Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Telem�vel"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+#, fuzzy
+msgid "Other Phone"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+#, fuzzy
+msgid "Other Address"
+msgstr "Endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "Data"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "Fora do escrit�rio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_Pasta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "Bip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "Nome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Fontes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Nenhuma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Nenhuma"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1125,136 +1573,528 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
-msgid "Evolution Calendar Conduit"
-msgstr "Atalho para _barra do Evolution"
+msgid "Card View"
+msgstr "Carro"
+
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:4
+#, fuzzy
+msgid "Body"
+msgstr "Hoje"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:6
+#, fuzzy
+msgid "Dimensions:"
+msgstr "Nenhuma descri��o"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
+msgid "F_ont..."
+msgstr "Imprimir..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+#, fuzzy
+msgid "Fonts"
+msgstr "M�s"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Footer:"
+msgstr "_Pastas"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+#, fuzzy
+msgid "Format"
+msgstr "F_ormato"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
+msgid "Header"
+msgstr "Ano"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+#, fuzzy
+msgid "Header/Footer"
+msgstr "Ano"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+#, fuzzy
+msgid "Headings"
+msgstr "Cabe�alhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:15
+#, fuzzy
+msgid "Height:"
+msgstr "Cabe�alhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:21
+#, fuzzy
+msgid "Margins"
+msgstr "�cones _grandes"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:23
+#, fuzzy
+msgid "Options"
+msgstr "_Op��es"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+#, fuzzy
+msgid "Orientation"
+msgstr "Organiza��o"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+#, fuzzy
+msgid "Page"
+msgstr "Bip"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Imprimir"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+#, fuzzy
+msgid "Paper"
+msgstr "Bip"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Paper source:"
+msgstr "Fontes de correio"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+#, fuzzy
+msgid "Portrait"
+msgstr "Prioridade"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+#, fuzzy
+msgid "Preview:"
+msgstr "Prever impress�o"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:33
+#, fuzzy
+msgid "Right:"
+msgstr "Cabe�alhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+#, fuzzy
+msgid "Sections:"
+msgstr "Segundos"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+#, fuzzy
+msgid "Shading"
+msgstr "Cabe�alhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
+msgstr "Tamanho"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+#, fuzzy
+msgid "Start on a new page"
+msgstr "Enviar uma nova mensagem"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+#, fuzzy
+msgid "Style name:"
+msgstr "Nome completo:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Top:"
+msgstr "Para:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+#, fuzzy
+msgid "Type:"
+msgstr "Para:"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Imprimir..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
+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."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 #, fuzzy
-msgid "Evolution ToDo Conduit"
+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
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Atalho para _barra do Evolution"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, 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
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, 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:8
+#, 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:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Cores"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Tamanho"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Nenhum sum�rio"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
+#: calendar/gui/alarm-notify/alarm-queue.c:991
 #, fuzzy
 msgid "Snooze"
 msgstr "Tamanho"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Ficheiro n�o encontrado"
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir calend�rio"
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Gravar calend�rio"
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+#, fuzzy
+msgid "High"
+msgstr "Cabe�alhos:"
+
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+#, fuzzy
+msgid "Normal"
+msgstr "F_ormato"
+
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+#, fuzzy
+msgid "Low"
+msgstr "Novo"
+
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 #, fuzzy
 msgid "Transparent"
 msgstr "Transportes"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
+#, fuzzy
+msgid "Not Started"
+msgstr "_Come�ando"
+
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
+#, fuzzy
+msgid "Completed"
+msgstr "Cores"
+
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
+msgid "Cancelled"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+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:896 e-util/e-time-utils.c:316
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1262,894 +2102,2620 @@ msgid ""
 "%s"
 msgstr ""
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
+msgid "None"
+msgstr "Nenhuma"
+
+#: calendar/gui/calendar-model.c:1087
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
+#: calendar/gui/calendar-model.c:1127
+msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
+#: calendar/gui/calendar-model.c:1168
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
+msgid "Undefined"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#: calendar/gui/calendar-model.c:1222
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-model.c:1710
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
+#: calendar/gui/calendar-model.c:1712
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
+#, fuzzy
+msgid "No"
+msgstr "Novo"
+
+#: calendar/gui/calendar-view-factory.c:149 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
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana"
+
+#: calendar/gui/calendar-view-factory.c:155 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
+#, fuzzy
+msgid "Month View"
+msgstr "M�s"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "O URI que o calend�rio mostrar�"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Situa��o das mensagens"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Situa��o das mensagens"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Esquecer _Senhas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#, fuzzy
+msgid "days"
+msgstr "DiasRascunhos"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#, fuzzy
+msgid "hours"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#, fuzzy
+msgid "minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "DiasRascunhos"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "Semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "Semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "Hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Descartar esta mensagem?"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Colar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Reminders"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "Sum�rio:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Op��es"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Data"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#, fuzzy
+msgid "day(s)"
+msgstr "DiasRascunhos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "05 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#, fuzzy
+msgid "10 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#, fuzzy
+msgid "12 hour (am/pm)"
+msgstr "12 horas (AM/PM)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#, fuzzy
+msgid "15 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#, fuzzy
+msgid "24 hour"
+msgstr "24 horas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "30 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "60 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+#, fuzzy
+msgid "Calendar"
+msgstr "Novo Ca_lend�rio"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Calendar Preferences"
+msgstr "Prefer�ncias"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors for Tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date Navigator"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Defaults"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Display"
 msgstr "Dia"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "End of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Fri"
+msgstr "Sex"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Show appointments"
+msgid "Friday"
+msgstr "Sex"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+msgid "Mon"
+msgstr "Seg"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#, fuzzy
+msgid "Remind me of all appointments"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Sat"
+msgstr "S�b"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
-msgid "Show tasks"
-msgstr "Ver _anexos"
+msgid "Saturday"
+msgstr "Domingo"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimir calend�rio"
+msgid "Show week numbers"
+msgstr "Mostrar 1 semana"
 
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "O URI que o calend�rio mostrar�"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#, fuzzy
+msgid "Start of day:"
+msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domingo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Thu"
+msgstr "Qui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
+#, fuzzy
+msgid "Thursday"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "_Pasta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "No summary available."
-msgstr "Nenhum sum�rio"
+msgid "Time zone:"
+msgstr "Nome completo:"
 
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "Tue"
+msgstr "Ter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
+#, fuzzy
+msgid "Tuesday"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Wed"
+msgstr "Qua"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr "Ir para"
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr "Nenhum sum�rio"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:460
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada di�ria?"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Nenhum sum�rio"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:120
+#, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:125
+#, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr ""
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "_Items seleccionados"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Segundos"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr ""
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "Compromissos:"
+
+#: calendar/gui/dialogs/event-editor.c:159
+#, fuzzy
+msgid "Reminder"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/event-editor.c:164
+#, fuzzy
+msgid "Recurrence"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Seg"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Activar"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 #, fuzzy
-msgid "End Date"
+msgid "Su_mmary:"
+msgstr "Sum�rio:"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "_End time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/dialogs/event-page.glade.h:11
 #, fuzzy
-msgid "Start Date"
+msgid "_Start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grupo %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Fontes"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Carro"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Pessoas _Necess�rias"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Summary"
-msgstr "Sum�rio"
+msgid "Needs Action"
+msgstr "Remover grupo"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Transparency"
-msgstr "Transportes"
+msgid "Declined"
+msgstr "Receber"
 
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Alarms"
-msgstr "Alarmes"
+msgid "Delegated"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, fuzzy
-msgid "Open..."
-msgstr "_Abrir"
+msgid "_Delegate To..."
+msgstr "Apagar"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Bip"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Telem�vel"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Status"
+msgstr "S�b"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organiza��o:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+#, fuzzy
+msgid "on"
+msgstr "Seg"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#, fuzzy
+msgid "day"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+#, fuzzy
+msgid "on the"
+msgstr "M�s"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+#, fuzzy
+msgid "th"
+msgstr "h"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+#, fuzzy
+msgid "occurrences"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "Exceptions"
+msgstr "_Ac��es"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#, fuzzy
+msgid "No recurrence"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#, fuzzy
+msgid "Preview"
+msgstr "Prever impress�o"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "Apagar todas as ocurr�ncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Segunda-feira"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#, fuzzy
+msgid "for"
+msgstr "Hora"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#, fuzzy
+msgid "month(s)"
+msgstr "M�s"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#, fuzzy
+msgid "until"
+msgstr "(Sem t�tulo)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#, fuzzy
+msgid "week(s)"
+msgstr "Semanas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#, fuzzy
+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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "_Items seleccionados"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
 msgstr "Apagar"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nenhuma"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:130
 #, fuzzy
-msgid "Delete the task"
+msgid "Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+#, fuzzy
+msgid "Progress"
+msgstr "Propriedades do alarme"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Hora de �n_icio de encontro"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioridade:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+#, fuzzy
+msgid "_Status:"
+msgstr "S�b"
+
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "_Abrir"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
+msgstr "Copiar"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
+msgstr "Colar"
+
+#: calendar/gui/e-calendar-table.c:861
+msgid "_Mark as Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Apagar este item"
+
+#: calendar/gui/e-calendar-table.c:1137
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Pressione aqui para o livro de endere�os"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Cores"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "End Date"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Start Date"
+msgstr "Hora de �n_icio de encontro"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+#, fuzzy
+msgid "Summary"
+msgstr "Sum�rio"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+#, fuzzy
+msgid "Transparency"
+msgstr "Transportes"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr ""
+
+#: calendar/gui/e-day-view-time-item.c:519
 #, 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:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-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:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr ""
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Hoje"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Ir para a _pasta..."
+
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Apagar esta ocurr�ncia"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Criar um novo calend�rio"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 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/e-week-view-main-item.c:338
-msgid "%d %B"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "_Editar Compromisso"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:409
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "on"
-msgstr "Seg"
+msgid "The message is not understandable."
+msgstr "Ficheiro n�o encontrado"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+#: calendar/gui/e-itip-control.c:740
 #, fuzzy
-msgid "day"
-msgstr "Hoje"
+msgid "This is a task request."
+msgstr "_Pedido de tarefa"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Segunda-feira"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:436
-#, fuzzy
-msgid "Tuesday"
-msgstr "Hoje"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:438
-#, fuzzy
-msgid "Thursday"
-msgstr "Hoje"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:439
-#, fuzzy
-msgid "Friday"
-msgstr "Sex"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid "Saturday"
-msgstr "Domingo"
+msgid "Calendar Message"
+msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Domingo"
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Data"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
-msgid "on the"
-msgstr "M�s"
+msgid "Loading Calendar"
+msgstr "Imprimir calend�rio"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
-msgid "th"
-msgstr "h"
+msgid "Loading calendar..."
+msgstr "Imprimir calend�rio"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid "occurrences"
-msgstr "Apagar todas as ocurr�ncias"
+msgid "Server Message:"
+msgstr "Encontrar mensagens"
 
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:403
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Criar um novo calend�rio"
+
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Novo compromisso"
+
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
+#: calendar/gui/goto-dialog.glade.h:1
+#, fuzzy
+msgid "April"
+msgstr "_Correio"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Seg"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ter"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Qua"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Qui"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "Hoje"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Sex"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "January"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "S�b"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "July"
+msgstr ""
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "June"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "N�o se consegui inicializar Bonobo"
+msgid "March"
+msgstr "Ano"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "May"
+msgstr "Segunda-feira"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "October"
+msgstr "Outro"
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Hoje"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30�"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31�"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "S�"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
 
 #. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1846
 #, fuzzy, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr "Ano corrente (%Y)"
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1854
 #, fuzzy
-msgid "Current month (%b %Y)"
+msgid "Selected month (%b %Y)"
 msgstr "M�s corrente (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano corrente (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Prever impress�o"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimir este item"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "Imprimir..."
+
+#: 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/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/tasks-migrate.c:106
+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
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, 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
+#, 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
 msgid "SMTWTFS"
 msgstr ""
 
+#: camel/camel-cipher-context.c:171
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:211
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:251
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:294
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:336
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Sincronizar"
+
+#: camel/camel-filter-driver.c:644
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: camel/camel-filter-driver.c:653
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: camel/camel-filter-driver.c:667
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:672
+#, fuzzy
+msgid "Cannot open message"
+msgstr "Encontrar mensagens"
+
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Sincronizar"
+
+#: camel/camel-filter-driver.c:766
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:892
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-filter-driver.c:898
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-folder-search.c:328
+#, 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:338
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:559
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, 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
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:201
+#, c-format
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:239
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
+msgstr ""
+
+#: camel/camel-movemail.c:263
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-pgp-context.c:193
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-pgp-context.c:196
 #, c-format
-msgid "Could not create pipe: %s"
+msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr ""
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
-msgid "Movemail program failed: %s"
+msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/camel-pgp-context.c:1063
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-provider.c:133
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calend�rio"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:489
+msgid "Server unexpectedly disconnected"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autentica��o"
+
+#: camel/camel-sasl-anonymous.c:119
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:131
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:143
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:35
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:37
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:43
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:810
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:819
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:825
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:847
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:865
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:875
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:42
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:161
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr ""
+
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "Autentica��o"
+
+#: camel/camel-search-private.c:111
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:548
+#, c-format
+msgid "Resolving: %s"
+msgstr ""
+
+#: camel/camel-service.c:575
 #, c-format
-msgid "No such host %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:600
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:70
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:75
+#: camel/camel-smime-context.c:173
 #, c-format
-msgid "URL string `%s' contains no protocol"
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-smime-context.c:209
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
+msgid "The signature certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-smime-context.c:249
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
+msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
 #, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Anexar um ficheiro � mensagem"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
 msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Assunto"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr "Criar um novo calend�rio"
+
+#: camel/camel-vee-folder.c:452
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Enviar a mensagem"
+
+#: camel/camel-vee-folder.c:547
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Enviar a mensagem"
+
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Enviar uma nova mensagem"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Encontrar mensagens"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Verificar novo correio"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+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:645
+msgid "Folders"
+msgstr "_Pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+#, fuzzy
+msgid "Namespace"
+msgstr "Responder"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:463
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2157,709 +4723,1028 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Enviar a mensagem"
+
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
+#: camel/providers/local/camel-local-store.c:173
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+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:268
+#, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, 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:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Sincronizar"
+
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Sincronizar"
+
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, 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:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "N�o consigo abrir a localiza��o: %s"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, 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:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Ficheiro n�o encontrado"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:149
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Encontrar mensagens"
+
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, 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:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:296
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Situa��o das mensagens"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: 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:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: 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-store.c:158
+#: 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-store.c:170
+#: 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:215
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-provider.c:40
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:170
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:172
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:174
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:176
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:178
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:180
+#, fuzzy
+msgid "Help message"
+msgstr "Encontrar mensagens"
+
+#: camel/providers/smtp/camel-smtp-transport.c:182
+#, fuzzy
+msgid "Service ready"
+msgstr "Servidor:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:184
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:186
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:188
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:190
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:192
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:194
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:196
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:198
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:202
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:204
+msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:206
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:208
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:212
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:214
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:216
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
-msgid "No authentication required"
+msgid "Temporary authentication failure"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+#: camel/providers/smtp/camel-smtp-transport.c:220
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autentica��o"
+
+#: camel/providers/smtp/camel-smtp-transport.c:315
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:397
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, c-format
 msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Mensagens enviadas"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentica��o"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:920
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Anexar um ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Remover"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
+#: composer/e-msg-composer-attachment.glade.h:1
 #, fuzzy
-msgid "From:"
-msgstr "De"
+msgid "Attachment properties"
+msgstr "Propriedades do alarme"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:3
+#, fuzzy
+msgid "File name:"
+msgstr "Nome completo:"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endere�os"
 
-#: composer/e-msg-composer-hdrs.c:313
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
 #, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "Introduza os receptores da mensagem"
+msgid "From:"
+msgstr "De"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Responder"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:395
 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:328
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2867,192 +5752,284 @@ msgstr ""
 "Entre os endere�os que ir�o receber uma c�pia da mensagem sem conhecimento "
 "do receptor"
 
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduza o assunto da carta"
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Anexar um ficheiro"
 
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Erro a gravar os atalhos."
+
+#: composer/e-msg-composer.c:873
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Seg"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Enviar uma nova mensagem"
+#: composer/e-msg-composer.c:997
+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:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Enviar uma nova mensagem"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1061
 #, c-format
-msgid "Error saving composition to 'Drafts': %s"
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Erro a gravar os atalhos."
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "_Inserir"
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Criar uma nova mensagem"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr ""
+
+#: composer/evolution-composer.c:359
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:374
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Atalho para _barra do Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Endere�o"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Nenhuma Informa��o"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
 msgstr ""
 
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
 msgstr ""
 
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
 msgstr ""
 
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Criar uma nova mensagem"
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
 
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "year"
 msgstr "Ano"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "Ano"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "M�s"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "M�s"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "week"
 msgstr "Semana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Semanas"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "days"
-msgstr "DiasRascunhos"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "hour"
 msgstr "Hora"
 
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "hours"
-msgstr "Horas"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 #, fuzzy
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:67
-#, fuzzy
-msgid "minutes"
-msgstr "Minutos"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr " segundos"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr " segundos"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:322
+#: 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"
@@ -3060,546 +6037,838 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
+#: filter/filter-datespec.c:575
+msgid " ago"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
+#: filter/filter-datespec.c:621
+msgid "ago"
 msgstr ""
 
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
+#: filter/filter-datespec.c:709
+msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
+msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:452
 #, fuzzy
 msgid "Then"
 msgstr "Qi"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:466
 #, fuzzy
 msgid "Add action"
 msgstr "_Ac��es"
 
-#: filter/filter-filter.c:420
-#, fuzzy
-msgid "Remove action"
-msgstr "Remover grupo"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome completo:"
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 #, fuzzy
 msgid "Untitled"
 msgstr "(Sem t�tulo)"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Adicionar"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:5
 #, fuzzy
-msgid "Remove criterion"
-msgstr "Remover grupo"
+msgid "Edit VFolders"
+msgstr "_Pastas"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 #, fuzzy
-msgid "Replied to"
-msgstr "Reponder para todos"
+msgid "Virtual Folders"
+msgstr "_Pastas"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
+#: filter/filter.glade.h:11
+msgid "specific folders only"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter.glade.h:12
 #, fuzzy
-msgid "Read"
-msgstr "Remover"
+msgid "vFolder Sources"
+msgstr "Adicionar Fonte"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "Ir para a _pasta..."
+msgid "Assign Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:5
 #, fuzzy
-msgid "Date received"
-msgstr "Receber"
+msgid "Attachments"
+msgstr "Anexo"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 #, fuzzy
-msgid "Date sent"
-msgstr "Data"
+msgid "contains"
+msgstr "_Ac��es"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:9
 #, fuzzy
-msgid "Forward to Address"
-msgstr "Enviar esta mensagem"
+msgid "Date received"
+msgstr "Receber"
 
 #: filter/libfilter-i18n.h:10
 #, fuzzy
-msgid "Message Body"
-msgstr "Situa��o das mensagens"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Situa��o das mensagens"
+msgid "Date sent"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+#, fuzzy
+msgid "Deleted"
+msgstr "Apagar"
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "Situa��o das mensagens"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
 #, fuzzy
-msgid "Score"
-msgstr "Fontes"
+msgid "does not sound like"
+msgstr "Ficheiro n�o encontrado"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
+msgid "Do Not Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "Situa��o online"
+msgid "Draft"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "Fontes"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#: filter/libfilter-i18n.h:21
 #, fuzzy
-msgid "Status"
-msgstr "S�b"
+msgid "Exist"
+msgstr "Pr�_ximo"
+
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assunto"
+#: filter/libfilter-i18n.h:24
+msgid "Important"
+msgstr ""
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "Data"
+msgid "is"
+msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "contains"
-msgstr "_Ac��es"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
+#, fuzzy
+msgid "Message Body"
+msgstr "Situa��o das mensagens"
 
 #: filter/libfilter-i18n.h:31
 #, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro n�o encontrado"
+msgid "Message Header"
+msgstr "Situa��o das mensagens"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
+#, fuzzy
+msgid "Message was sent"
+msgstr "Situa��o das mensagens"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Read"
+msgstr "Remover"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Replied to"
+msgstr "Reponder para todos"
+
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+#, fuzzy
+msgid "Score"
+msgstr "Fontes"
+
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
+#, fuzzy
+msgid "Set Status"
+msgstr "Situa��o online"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamanho"
+
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "�cone_s pequenos"
+
+#: filter/libfilter-i18n.h:47
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:50
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Assunto"
+
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:127
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Adicionar Fonte"
+
+#: filter/rule-editor.c:240
 #, fuzzy
 msgid "Add Rule"
 msgstr "Adicionar Fonte"
 
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Adicionar Fonte"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "Fontes"
+
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
 msgstr ""
 
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "_Correio"
 
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: importers/elm-importer.c:527
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "_Nova pasta"
+msgid "Elm mail"
+msgstr "Correio electr�nico 2"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:239
-msgid "Body contains"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: importers/netscape-importer.c:824
 #, fuzzy
-msgid "Subject contains"
-msgstr "Assunto"
+msgid "Settings"
+msgstr "Segundos"
 
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Endere�o principal de correio electr�nico"
 
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configura��o do correio"
+
+#: mail/component-factory.c:111
+#, fuzzy
+msgid "This folder cannot contain messages."
+msgstr "Uma pasta contendo items de correio"
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Propriedades do alarme"
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Propriedades"
+
+#: mail/component-factory.c:757
+msgid "Cannot initialize Evolution's mail component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: mail/component-factory.c:894
+msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propriedades do alarme"
+
+#: mail/folder-browser-ui.c:256
+#, fuzzy
+msgid "Properties"
+msgstr "Propriedades do alarme"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:893
 #, fuzzy
-msgid "Filter on Sender"
+msgid "Store search as vFolder"
+msgstr "_Nova pasta"
+
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Assunto"
+
+#: mail/folder-browser.c:1241
+#, fuzzy
+msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1244
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Situa��o das mensagens"
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1247
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:1253
 #, fuzzy
-msgid "Open"
-msgstr "_Abrir"
+msgid "Filter on Sub_ject"
+msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:660
-msgid "Save As..."
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "Ficheiro n�o encontrado"
+
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
+#: mail/folder-browser.c:1273
+#, fuzzy
+msgid "Resend"
+msgstr " segundos"
+
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "_Save As..."
+msgstr "Gravar na _pasta..."
+
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
-msgid "Reply to Sender"
+msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Reponder para todos"
+
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:666
-msgid "Forward inline"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
+msgstr ""
+
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Move to Folder..."
+msgid "_Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1304
 #, fuzzy
-msgid "Copy to Folder..."
+msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
-msgid "Undelete"
+msgid "_Undelete"
 msgstr "Apagar"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:1322
 #, fuzzy
-msgid "Create Rule From Message"
+msgid "Create Ru_le From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Uma pasta contendo items de correio"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhuma"
+#: mail/folder-browser.c:1483
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
 
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Apagar"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "F_ormato"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/local-config.glade.h:4
 msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+"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
+#, fuzzy
+msgid "maildir"
+msgstr "Correio electr�nico 2"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "mbox"
+msgstr "Correio novo"
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
+#: 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 ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Atalho para _barra do Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
+#, fuzzy
+msgid " (default)"
+msgstr "Apagar"
+
+#: mail/mail-accounts.c:174
+#, fuzzy
+msgid "Disable"
+msgstr "Como _Tabela"
+
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:264
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Apagar"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: 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:742
+msgid "Evolution Account Manager"
+msgstr ""
+
+#: mail/mail-autofilter.c:70
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Fontes de correio"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assunto"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+msgid "Add Filter Rule"
+msgstr ""
+
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3607,796 +6876,2624 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:365
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:410
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:653
+#, c-format
+msgid "On %s, %s wrote:"
+msgstr ""
+
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1430
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Situa��o das mensagens"
+
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Pasta"
+
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-callbacks.c:1966
 #, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:629
-#, c-format
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
+#: mail/mail-config.glade.h:1
+msgid " Check for supported types "
 msgstr ""
 
-#: mail/mail-display.c:229
+#: mail/mail-config.glade.h:2
 #, fuzzy
-msgid "Save Attachment"
+msgid " color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "Account"
+msgstr "�cone_s pequenos"
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "Account Information"
+msgstr "Nenhuma Informa��o"
+
+#: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Accounts"
+msgstr "�cone_s pequenos"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentica��o"
+
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Authentication Type: "
+msgstr "Autentica��o"
+
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Automatically check for new mail every"
+msgstr "Verificar novo correio"
+
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:19
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "De_fault"
+msgstr "Apagar"
+
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-display.c:315
-msgid "View Inline"
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
 msgstr ""
 
-#: mail/mail-display.c:342
-msgid "External Viewer"
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Done"
+msgstr "Nenhuma"
+
+#: mail/mail-config.glade.h:32
+#, 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:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Imprimir..."
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Email Address:"
+msgstr "Endere�o de correio:"
+
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-display.c:369
-msgid "Hide"
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "Adicionar anexo"
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nome completo:"
 
-#: mail/mail-format.c:626
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
 #, fuzzy
-msgid "Reply-To:"
-msgstr "Responder"
+msgid "HTML Signature:"
+msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-config.glade.h:45
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:46
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Encrypted message"
-msgstr "Enviar a mensagem"
+msgid "Kerberos "
+msgstr "Servidor:"
 
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
+#: mail/mail-config.glade.h:51
+msgid "Mail Configuration"
+msgstr "Configura��o do correio"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "F_ormato"
+
+#: mail/mail-config.glade.h:53
+msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "Situa��o das mensagens"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
 msgstr ""
 
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "News"
+msgstr "Novo"
+
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Optional Information"
+msgstr "Nenhuma Informa��o"
+
+#: mail/mail-config.glade.h:63
+msgid "Organization:"
+msgstr "Organiza��o:"
+
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-config.glade.h:66
+msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-config.glade.h:75
 #, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Nova pasta"
+msgid "Quoted"
+msgstr "Nenhuma"
 
-#: mail/mail-local.c:269
+#: mail/mail-config.glade.h:76
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:77
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "Receiving Options"
+msgstr ""
+
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Closing current folder"
-msgstr "Fechar o calend�rio corrente"
+msgid "Required Information"
+msgstr "Nenhuma Informa��o"
 
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Creating new folder"
-msgstr "Criar um novo calend�rio"
+msgid "Send mail in HTML format by default."
+msgstr "Enviar mensagem em formato HTML"
 
-#: mail/mail-local.c:327
+#: mail/mail-config.glade.h:87
 #, fuzzy
-msgid "Copying messages"
-msgstr "Encontrar mensagens"
+msgid "Sending Email"
+msgstr "Enviar"
 
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviar"
+
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#, fuzzy
+msgid "Sent"
+msgstr "Enviar"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Configura��o do correio"
+
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:95
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+msgid "Signature file:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Nenhuma Informa��o"
+
+#: mail/mail-config.glade.h:99
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Special Folders"
+msgstr "_Pastas"
+
+#: mail/mail-config.glade.h:101
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-config.glade.h:103
+msgid "Use secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+msgid "Username:"
+msgstr "Utilizador:"
+
+#: mail/mail-config.glade.h:105
 msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-local.c:789
-msgid "Register local folder"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr " segundos"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-display.c:221
+#, fuzzy
+msgid "Save Attachment"
+msgstr "Anexo"
+
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-mt.c:85
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-display.c:399
 #, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:403
+msgid "Hide"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Working"
-msgstr "Seg"
+msgid "Loading message content"
+msgstr "Mensagens enviadas"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "�brir em nova janela"
+
+#: mail/mail-display.c:1406
+msgid "Copy Link Location"
+msgstr ""
 
-#: mail/mail-ops.c:107
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "Gravar na _pasta..."
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gravar como VCard"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "Fetching email from %s"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-ops.c:109
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
 #, c-format
-msgid "Fetch email from %s"
+msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-ops.c:359
+#: mail/mail-folder-cache.c:186
 #, c-format
-msgid "There is no new mail at %s."
+msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
 msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
+#: mail/mail-format.c:609
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "Adicionar anexo"
+
+#: mail/mail-format.c:662
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
+#: mail/mail-format.c:746
+#, fuzzy
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Endere�o"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#, fuzzy
+msgid "To"
+msgstr "Para:"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
+msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-ops.c:565
+#: mail/mail-format.c:1318
 #, fuzzy
-msgid "Sending message"
-msgstr "Mensagens enviadas"
+msgid "Encrypted message"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-format.c:1319
+msgid "Click icon to decrypt."
+msgstr ""
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
+#: mail/mail-format.c:1377
+msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-ops.c:684
-msgid "Send queue"
+#: mail/mail-format.c:1388
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
+#: mail/mail-format.c:2046
 #, c-format
-msgid "Appending \"%s\""
+msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
+#: mail/mail-format.c:2060
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:2065
+#, c-format
+msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-ops.c:912
+#: mail/mail-format.c:2094
 #, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
+msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-format.c:2102
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:2107
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-local.c:458
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-local.c:747
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:868
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
+
+#: mail/mail-local.c:907
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_Nova pasta"
+
+#: mail/mail-mt.c:187
 #, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
+msgid ""
+"Error while '%s':\n"
+"%s"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-mt.c:190
 #, c-format
-msgid "Move messages from \"%s\" into \"%s\""
+msgid ""
+"Error while performing operation:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-mt.c:794
+#, fuzzy
+msgid "Working"
+msgstr "Seg"
+
+#: mail/mail-ops.c:578
 #, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
+msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Mensagens enviadas"
+
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#, fuzzy
+msgid "Complete."
+msgstr "Cores"
+
+#: mail/mail-ops.c:805
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Erro a gravar os atalhos."
+
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Encontrar mensagens"
+
+#: mail/mail-ops.c:901
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:904
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
 #, fuzzy
-msgid "(No description)"
-msgstr "Nenhuma descri��o"
+msgid "Trash"
+msgstr "_Tarefa"
 
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1297
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-ops.c:1568
 #, fuzzy
-msgid "Synchronising folder"
-msgstr "Sincronizar"
+msgid "Refreshing folder"
+msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
+#: mail/mail-ops.c:1987
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Anexo"
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-ops.c:2003
+#, fuzzy, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Criar um novo calend�rio"
 
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:2032
 #, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:2101
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sem t�tulo)"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Encontrar mensagens"
 
-#: mail/mail-threads.c:917
+#: mail/mail-search.c:239
 #, fuzzy
-msgid "Could not create dialog box."
-msgstr "N�o se consegui inicializar Bonobo"
+msgid "Empty Message"
+msgstr "Mensagem de _correio"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Mensagens enviadas"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Ano"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Encontrar"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Caminho"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:250
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
+#: mail/mail-send-recv.c:253
+#, fuzzy
+msgid "Receiving"
+msgstr "Receber"
+
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
+#: mail/mail-send-recv.c:323
+#, fuzzy
+msgid "Sending"
+msgstr "Enviar"
+
+#: mail/mail-send-recv.c:488
+msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-tools.c:381
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Enviar esta mensagem"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "Nenhuma Informa��o"
 
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
+#: mail/mail-tools.c:173
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:530
-#, fuzzy, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr "N�o consigo abrir a localiza��o: %s"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Enviar esta mensagem"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Responder"
+#: mail/message-list.c:613
+msgid "Unseen"
+msgstr ""
 
-#: mail/mail-view.c:138
+#: mail/message-list.c:614
 #, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "Responder ao emissor desta mensagem"
+msgid "Seen"
+msgstr "Enviar"
 
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Reponder a todos receptores da mensagem"
+#: mail/message-list.c:615
+msgid "Answered"
+msgstr ""
 
-#: mail/mail-view.c:144
+#: mail/message-list.c:616
 #, fuzzy
-msgid "Forward this message"
-msgstr "Enviar esta mensagem"
+msgid "Multiple Unseen Messages"
+msgstr "Criar uma nova mensagem"
 
-#: mail/mail-view.c:148
+#: mail/message-list.c:617
 #, fuzzy
-msgid "Print the selected message"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Multiple Messages"
+msgstr "Encontrar mensagens"
+
+#: mail/message-list.c:621
+msgid "Lowest"
+msgstr ""
+
+#: mail/message-list.c:622
+msgid "Lower"
+msgstr ""
 
-#: mail/mail-view.c:150
+#: mail/message-list.c:626
 #, fuzzy
-msgid "Delete this message"
-msgstr "Enviar esta mensagem"
+msgid "Higher"
+msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:599
-msgid "Unseen"
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Highest"
+msgstr "Cabe�alhos:"
+
+#: mail/message-list.c:877
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:884
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:893
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:905
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:913
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:915
+msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "Seen"
-msgstr "Enviar"
+msgid "Updating message list"
+msgstr "Encontrar mensagens"
 
-#: mail/message-list.c:605
-msgid "Answered"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Received"
+msgstr "Receber"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "Tamanho"
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Folder"
+msgstr "_Pastas"
+
+#: mail/subscribe-dialog.c:77
+#, fuzzy
+msgid "Store"
+msgstr "Fontes"
+
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:168
 #, c-format
-msgid "[ %s ]"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
+#: mail/subscribe-dialog.c:271
 #, c-format
-msgid "%s, et al."
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
+#: mail/subscribe-dialog.c:273
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Abrir ficheiro"
+
+#. Construct the app
+#: mail/subscribe-dialog.c:878
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Nenhuma descri��o"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: mail/message-list.c:973
-msgid "?"
-msgstr "?"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Compromissos:"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Compromisso - %s"
+
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Nenhum sum�rio"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Adicionar novo grupo"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: mail/message-list.c:1109
-msgid "Flagged"
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Instala��o do Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: mail/message-list.c:1109
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:206
 #, fuzzy
-msgid "Attachment"
-msgstr "Anexo"
+msgid "No tasks"
+msgstr "Ver _anexos"
 
-#: mail/message-list.c:1110
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
-msgid "From"
-msgstr "De"
+msgid "Regions"
+msgstr "Segundos"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr ""
 
-#: mail/message-list.c:1110
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Date"
-msgstr "Data"
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
+msgstr ""
 
-#: mail/message-list.c:1110
+#: my-evolution/main.c:52
 #, fuzzy
-msgid "Received"
-msgstr "Receber"
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Component de correio: N�o consegui inicializar Bonobo"
 
-#: mail/message-list.c:1111
+#: my-evolution/metar.c:44
 #, fuzzy
-msgid "To"
-msgstr "Para:"
+msgid "Clear sky"
+msgstr "Carro"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: mail/message-list.c:1111
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
 #, fuzzy
-msgid "Size"
+msgid "North"
+msgstr "Hora"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Colar"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "Hora"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Qa"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Horas"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
 msgstr "Tamanho"
 
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
 msgstr ""
 
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
+#: my-evolution/metar.c:102
+msgid "Light snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Criar um novo calend�rio"
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
 #, fuzzy
-msgid "Folder"
-msgstr "_Pastas"
+msgid "Hail"
+msgstr "_Correio"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
 
-#: mail/subscribe-dialog.c:63
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
 #, fuzzy
-msgid "Store"
+msgid "Partial hail"
+msgstr "Endere�o principal de correio electr�nico"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Thick mist"
+msgstr "Lista de tarefas"
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Prioridade"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
 msgstr "Fontes"
 
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Ver _anexos"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Ano"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "DiasRascunhos"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Adicionar novo grupo"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "_Pastas"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "_Ac��es"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Mostrar uma pasta diferente"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Dia"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Sex"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Servidor:"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Segunda-feira"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "M�s"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "Semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Ver _anexos"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Ver _anexos"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "_Tarefa"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "_Correio"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Evolution - %s"
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Ver _anexos"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "_Pastas"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instala��o do Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:130
 #, 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:157
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros do Evolution instalados com sucesso"
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:200
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Esta parece ser a primeira vez que est� a correr o Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4404,14 +9501,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4419,7 +9516,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4427,1708 +9533,2899 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Ir para a _pasta..."
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Ir para a _pasta..."
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "_Nova pasta"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrir ficheiro"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "O Evolution n�o consegue criar as suas pastas locais"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:297
+#: shell/e-shell-folder-selection-dialog.c:343
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sem t�tulo)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+#, fuzzy
+msgid "Importing"
+msgstr "Seg"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erro a gravar os atalhos."
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Erro a gravar os atalhos."
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "Nome completo:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Ficheiro com assinatura:"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "Nome completo:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "_Nova pasta"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 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:120
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "N�o consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:217
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "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:334
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Criar um novo contacto"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Seg"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Seg"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "_Pastas"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 #, fuzzy
 msgid "Group name:"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Mudar nome de atalho"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Remover este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "�cone_s pequenos"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co �cones grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
-msgid "_Remove This Group..."
+msgid "_Remove this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Remover grupo"
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Remover este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostrar barra de atalho_s"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Mudar nome de atalho"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Mudar nome de atalho"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "�brir em nova janela"
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activar este atalho"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-shortcuts.c:982
 #, fuzzy
-msgid "_View"
-msgstr "_Novo"
+msgid "Shortcuts"
+msgstr "Mudar nome de atalho"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-shortcuts.c:984
 #, fuzzy
-msgid "View the selected folder"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Inbox"
+msgstr "Correio novo"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178 shell/e-storage.c:184
 #, fuzzy
 msgid "(No name)"
 msgstr "Nome"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/main.c:74
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Uma pasta contendo tarefas"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Horas"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome completo:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_Pastas"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Atalho para _barra do Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Atalho para _barra do Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"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"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\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 eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#: shell/main.c:215
+msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:178
-msgid "Disable."
+#: shell/main.c:216
+msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializa��o do sistema de componentes Bonobo."
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Compromisso"
+msgid "Copy the selection"
+msgstr "Anular a �ltima opera��o"
 
-#: ui/evolution-contact-editor.xml:8
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "Pedido de _encontro"
+msgid "Create new contact"
+msgstr "Criar um novo contacto"
 
-#: ui/evolution-contact-editor.xml:10
+#: ui/evolution-addressbook.xml.h:5
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "Mensagem de _correio"
+msgid "Create new contact list"
+msgstr "A sua lista de contactos"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Apagar um contacto"
+
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "New contact"
+msgstr "Encontrar um contacto"
+
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Novo"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Colar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "Colar item da �rea de transfer�ncia"
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
+msgstr "Imprimir contactos"
+
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "Reponder para todos"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Apagar um contacto"
 
-#: ui/evolution-contact-editor.xml:11
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
-msgid "FIXME: _Contact"
+msgid "Stop"
+msgstr "Fontes"
+
+#: ui/evolution-addressbook.xml.h:21
+#, fuzzy
+msgid "Stop Loading"
+msgstr "Cabe�alhos:"
+
+#: ui/evolution-addressbook.xml.h:22
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Adicionar Fonte"
+
+#: ui/evolution-addressbook.xml.h:23
+#, fuzzy
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
 msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-addressbook.xml.h:28
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:13
+#: ui/evolution-addressbook.xml.h:29
 #, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "_Pedido de tarefa"
+msgid "_Select All"
+msgstr "Reponder para todos"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
+msgstr "_Ferramentas"
 
-#: ui/evolution-contact-editor.xml:14
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "_Entrada di�ria?"
+msgid "Create a New All-Day _Event"
+msgstr "Criar um novo contacto"
+
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
+msgstr "Criar um novo compromisso para hoje"
+
+#: ui/evolution-calendar.xml.h:6
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso para hoje"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create an event for the whole day"
+msgstr "Criar um novo compromisso para hoje"
+
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Go To"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:10
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
+#: ui/evolution-calendar.xml.h:11
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to a specific date"
+msgstr "Ir para uma data espec�fica"
+
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go to present time"
+msgstr "Ir para o pr�ximo item"
+
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "New Appointment"
+msgstr "Novo compromisso"
+
+#: ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Print calendar"
+msgstr "Imprimir calend�rio"
+
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print this Calendar"
+msgstr "Imprimir este calend�rio"
+
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "Pedido de _encontro"
+msgid "Publish Free/Busy Information"
+msgstr "Nenhuma Informa��o"
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:35
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
+msgstr "Mostrar 1 dia"
+
+#: ui/evolution-calendar.xml.h:25
+msgid "Show 1 month"
+msgstr "Mostrar 1 m�s"
+
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 week"
+msgstr "Mostrar 1 semana"
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
+msgstr "Mostrar a semana de trabalho"
+
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Adicionar anexo..."
+msgid "W_ork Week"
+msgstr "Semana"
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
+msgstr "_Novo compromisso..."
+
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Prefer�ncias"
+
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Day"
+msgstr "DiasRascunhos"
+
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Month"
+msgstr "M�s"
+
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
+msgstr "Semana"
+
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Cores"
+
+#: ui/evolution-comp-editor.xml.h:3
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Novo compromisso"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "Page Set_up"
-msgstr "Imprimir"
+msgid "Preview the printed item"
+msgstr "Imprimir este item"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Prever impress�o"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimir este item"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+#, fuzzy
+msgid "Save and Close"
+msgstr "Guardar Calend�rio como"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Ac��es"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_File"
+msgstr "_Pasta"
+
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Apagar este item"
+
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "Apagar"
+
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objecto"
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Imprimir..."
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
+#, fuzzy
+msgid "Save _As..."
+msgstr "Gravar na _pasta..."
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "Enviar mensagem em formato HTML"
+
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+#, fuzzy
+msgid "_Save"
+msgstr "S�"
+
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Apagar este item"
+
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Contacto"
+msgid "Send _message to list..."
+msgstr "Enviar a mensagem"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "An_terior"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:102
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Ne_xt"
-msgstr "Pr�_ximo"
+msgid "Forward as i_Calendar"
+msgstr "Imprimir calend�rio"
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Ferramentas"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Enviar esta mensagem"
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Ac��es"
+
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "Evolution - %s"
+
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Ficheiro com assinatura:"
+
+#: ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Compose"
+msgstr "Cores"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Criar uma nova mensagem"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-mail-global.xml.h:8
+#, fuzzy
+msgid "Empty _Trash"
+msgstr "Dias vazios:"
+
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Esquecer _Senhas"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
-msgid "_Forms"
-msgstr "_Pasta"
+msgid "Send / Receive"
+msgstr "Receber"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:142
+#: ui/evolution-mail-global.xml.h:16
 #, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Contacto"
+msgid "Show message preview window"
+msgstr "Se uma previs�o da mensagem deve ser mostrada"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Contacto"
+msgid "Virtual Folder _Editor..."
+msgstr "_Pastas"
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Enviar mensagem em formato HTML"
+msgid "_Filters..."
+msgstr "Dru�da dos _filtros"
 
-#: ui/evolution-contact-editor.xml:147
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Contacto"
+msgid "_Mail Message"
+msgstr "Mensagem de _correio"
 
-#: ui/evolution-contact-editor.xml:148
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_Contacto"
+msgid "_Mail Settings..."
+msgstr "Configura��o do co_rreio..."
 
-#: ui/evolution-contact-editor.xml:149
+#: ui/evolution-mail-global.xml.h:22
 #, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Contacto"
+msgid "_Preview Pane"
+msgstr "Prever impress�o"
 
-#: ui/evolution-contact-editor.xml:150
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "_Entrada di�ria?"
+msgid "_Send / Receive"
+msgstr "Receber"
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:153
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "Mensagem de _correio"
+msgid "Copy selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-contact-editor.xml:154
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "Mensagem de _correio"
+msgid "Cut selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Novas mensagens de correio"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Inserir"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormato"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Colar item da �rea de transfer�ncia"
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Ferramentas"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_Ac��es"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#, fuzzy
+msgid "Select _All"
+msgstr "Reponder para todos"
 
-#: ui/evolution-contact-editor.xml:246
+#: ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "FIXME: Previous"
-msgstr "An_terior"
+msgid "Select _Thread"
+msgstr "Reponder para todos"
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Ir para o item anterior"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "_Contacto"
+msgid "Select all visible messages"
+msgstr "Enviar esta mensagem"
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Ir para o pr�ximo item"
+#: ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Show _All"
+msgstr "Novas mensagens de correio"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora do escrit�rio"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nenhuma Informa��o"
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Enviar esta mensagem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Op��es"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Pasta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
+#: ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "_Properties..."
+msgstr "Propriedades do alarme"
+
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Reponder a todos receptores da mensagem"
+
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder ao emissor desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: ui/evolution-mail-message.xml.h:7
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Mensagens de correio em rascunho"
+
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Pessoas _Necess�rias"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de �n_icio de encontro"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder ao emissor desta mensagem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _fim de _encontro"
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Descartar esta mensagem?"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 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:421
-msgid "MTWTFSS"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Descartar esta mensagem?"
+
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Descartar esta mensagem?"
+
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "Ficheiro n�o encontrado"
 
-#: widgets/misc/e-dateedit.c:407
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Now"
-msgstr "Novo"
+msgid "Filter on _Recipients..."
+msgstr "Ficheiro n�o encontrado"
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
+msgstr "Ficheiro n�o encontrado"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
+#: ui/evolution-mail-message.xml.h:30
+#, fuzzy
+msgid "Forward As"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward _Inline"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "Apagar um contacto"
+msgid "Forward _Quoted"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-#~ msgid "Address _2:"
-#~ msgstr "Endere�o"
+msgid "Forward the selected message to someone"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
-#~ msgid "Check Address"
-#~ msgstr "Endere�o"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-#~ msgid "Finland"
-#~ msgstr "Encontrar"
+msgid "Mark the selected messages as important"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-#~ msgid "_Address:"
-#~ msgstr "Endere�o"
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Adicionar Fonte"
+msgid "Mark the selected messages for deletion"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-#~ msgid "Find..."
-#~ msgstr "Encontrar"
+msgid "Move"
+msgstr "Sg"
 
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "Situa��o das mensagens"
+msgid "Move selected messages to another folder"
+msgstr "Gravar a mensagem na pasta especificada"
 
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "_Items seleccionados"
+msgid "Next"
+msgstr "Pr�_ximo"
 
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "_Items seleccionados"
+msgid "Next Important Message"
+msgstr "Responder ao emissor desta mensagem"
 
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-#~ msgid "a"
-#~ msgstr "am"
+msgid "Next Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
-#~ msgid "b"
-#~ msgstr "%b"
+msgid "Next Thread"
+msgstr "Reponder para todos"
 
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-#~ msgid "c"
-#~ msgstr "Cc"
+msgid "Next Unread Message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-#~ msgid "e"
-#~ msgstr "Qa"
+msgid "Open the selected message in a new window"
+msgstr "Imprimir a mensagem seleccionada"
 
-#~ msgid "h"
-#~ msgstr "h"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-#~ msgid "k"
-#~ msgstr "Ok"
+msgid "Previews the message to be printed"
+msgstr "Enviar a mensagem"
 
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
-#~ msgid "m"
-#~ msgstr "am"
+msgid "Previous"
+msgstr "An_terior"
 
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-#~ msgid "o"
-#~ msgstr "Para"
+msgid "Previous Important Message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-#~ msgid "p"
-#~ msgstr "pm"
+msgid "Previous Message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-#~ msgid "r"
-#~ msgstr "Sx"
+msgid "Previous Unread Message"
+msgstr "Descartar esta mensagem?"
 
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-#~ msgid "u"
-#~ msgstr "Do"
+msgid "Print Message..."
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-#~ msgid "Body"
-#~ msgstr "Hoje"
+msgid "Print Preview..."
+msgstr "Prever impress�o"
 
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-#~ msgid "Font..."
-#~ msgstr "Imprimir..."
+msgid "Print this message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Reponder para todos"
+
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-#~ msgid "Fonts"
-#~ msgstr "M�s"
+msgid "S_earch Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
-#~ msgid "Format"
-#~ msgstr "F_ormato"
+msgid "Save the message as a text file"
+msgstr "Gravar a mensagem na pasta especificada"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
-#~ msgid "Header"
-#~ msgstr "Ano"
+msgid "Show Email _Source"
+msgstr "atalhos principais"
 
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-#~ msgid "Headings"
-#~ msgstr "Cabe�alhos:"
+msgid "Show Full _Headers"
+msgstr "Novas mensagens de correio"
 
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
-#~ msgid "Height:"
-#~ msgstr "Cabe�alhos:"
+msgid "Show message in the normal style"
+msgstr "Enviar mensagem em formato HTML"
 
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "�cones _grandes"
+msgid "Show message with all email headers"
+msgstr "Gravar a mensagem na pasta especificada"
 
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-#~ msgid "Options"
-#~ msgstr "_Op��es"
+msgid "Show the raw email source of the message"
+msgstr "Anexar um ficheiro � mensagem"
 
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "Organiza��o"
+msgid "Un-delete the selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-#~ msgid "Page"
-#~ msgstr "Bip"
+msgid "VFolder on Se_nder..."
+msgstr "Ficheiro n�o encontrado"
+
+#: ui/evolution-mail-message.xml.h:82
+msgid "VFolder on _Recipients..."
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:83
+msgid "VFolder on _Subject..."
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
-#~ msgid "Paper"
-#~ msgstr "Bip"
+msgid "_Apply Filters"
+msgstr "Dru�da dos _filtros"
 
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-#~ msgid "Paper source:"
-#~ msgstr "Fontes de correio"
+msgid "_Copy to Folder"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "Prioridade"
+msgid "_Create Filter From Message"
+msgstr "Mensagens de correio em rascunho"
 
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-#~ msgid "Preview:"
-#~ msgstr "Prever impress�o"
+msgid "_Forward Message"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "Segundos"
+msgid "_Message Display"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-#~ msgid "Shading"
-#~ msgstr "Cabe�alhos:"
+msgid "_Move to Folder"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
-#~ msgid "Start on a new page"
-#~ msgstr "Enviar uma nova mensagem"
+msgid "_Normal Display"
+msgstr "Dia"
 
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-#~ msgid "Style name:"
-#~ msgstr "Nome completo:"
+msgid "_Open Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-#~ msgid "Top:"
-#~ msgstr "Para:"
+msgid "_Re-send Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Novo Ca_lend�rio"
+msgid "Close this window"
+msgstr "Novo compromisso"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Atalho para _barra do Evolution"
+msgid "_Close"
+msgstr "Cores"
 
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
+msgid "_View"
+msgstr "_Novo"
+
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Anexar"
 
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "_Editar Compromisso"
+msgid "Close the current file"
+msgstr "Fechar o calend�rio corrente"
 
+#: ui/evolution-message-composer.xml.h:5
 #, fuzzy
-#~ msgid "05 minutes"
-#~ msgstr "Minutos"
+msgid "Delete all but signature"
+msgstr "Ficheiro com assinatura:"
 
+#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-#~ msgid "10 minutes"
-#~ msgstr "Minutos"
+msgid "Encrypt this message with PGP"
+msgstr "Enviar a mensagem"
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:8
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 horas (AM/PM)"
+msgid "Insert a file as text into the message"
+msgstr "Anexar um ficheiro � mensagem"
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "Insert text file..."
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
-#~ msgid "15 minutes"
-#~ msgstr "Minutos"
+msgid "Open a file"
+msgstr "Abrir ficheiro"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:16
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "S/MIME Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 #, fuzzy
-#~ msgid "24 hour"
-#~ msgstr "24 horas"
+msgid "Save"
+msgstr "S�"
 
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-#~ msgid "30 minutes"
-#~ msgstr "Minutos"
+msgid "Save As"
+msgstr "Guardar Calend�rio como"
 
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-#~ msgid "60 minutes"
-#~ msgstr "Minutos"
+msgid "Save in folder..."
+msgstr "Gravar na _pasta..."
 
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "Novo Ca_lend�rio"
+msgid "Save the current file"
+msgstr "Ficheiro com assinatura:"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Calendar Preferences"
-#~ msgstr "Prefer�ncias"
+msgid "Save the current file with a different name"
+msgstr "Ficheiro com assinatura:"
 
-#~ msgid "Colors"
-#~ msgstr "Cores"
+#: ui/evolution-message-composer.xml.h:26
+msgid "Save the message in a specified folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send"
+msgstr "Enviar"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "Show week numbers"
-#~ msgstr "Mostrar 1 semana"
+msgid "Send _Later"
+msgstr "Enviar"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "_Tarefa"
+msgid "Send _later"
+msgstr "Enviar"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes"
+msgid "Send the mail in HTML format"
+msgstr "Enviar mensagem em formato HTML"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "Work week"
-#~ msgstr "Semana"
+msgid "Send the message later"
+msgstr "Enviar a mensagem"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "seconds."
-#~ msgstr " segundos"
+msgid "Send this message now"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "Normal"
-#~ msgstr "F_ormato"
+msgid "Show / hide attachments"
+msgstr "Ver/esconder anexos"
 
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-#~ msgid "Not Started"
-#~ msgstr "_Come�ando"
+msgid "Show _attachments"
+msgstr "Ver _anexos"
 
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Tarefa"
+msgid "Show attachments"
+msgstr "Ver _anexos"
 
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "_Contacto"
+msgid "Sign this message with your PGP key"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Prioridade:"
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Compromissos:"
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Mostrar a barra de pastas"
 
-#~ msgid "Days"
-#~ msgstr "DiasRascunhos"
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Mostrar a barra de pastas"
 
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "_Ac��es"
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Mostrar a barra de pastas"
 
-#~ msgid "Hours"
-#~ msgstr "Horas"
+#: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:42
 #, fuzzy
-#~ msgid "Mail _to:"
-#~ msgstr "atalhos principais"
+msgid "_Attachment..."
+msgstr "Adicionar anexo..."
 
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "Segunda-feira"
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Cc Field"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Prever impress�o"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Activar"
+msgid "_Delete all"
+msgstr "Apagar"
 
-#, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "Sum�rio:"
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "_Mail"
-#~ msgstr "_Correio"
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr "_Inserir"
 
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
-#~ msgid "day(s)"
-#~ msgstr "DiasRascunhos"
+msgid "_Open..."
+msgstr "_Abrir"
 
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
-#~ msgid "month(s)"
-#~ msgstr "M�s"
+msgid "_Reply-To Field"
+msgstr "Responder"
+
+#: ui/evolution-message-composer.xml.h:55
+msgid "_Security"
+msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
 #, fuzzy
-#~ msgid "week(s)"
-#~ msgstr "Semanas"
+msgid "_Help"
+msgstr "Casa"
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
+#: ui/evolution-subscribe.xml.h:2
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "_Correio"
+msgid "F_older"
+msgstr "_Pastas"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:7
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Hoje"
+msgid "Subscribe"
+msgstr "Fontes"
+
+#: ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr ""
 
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "Ano"
+msgid "Delegate Task"
+msgstr "Apagar este item"
+
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
+msgstr ""
 
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "Segunda-feira"
+msgid "Copy selected task"
+msgstr "Copiar item seleccionada para a �rea de transfer�ncia"
 
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "Outro"
+msgid "Create a new task"
+msgstr "Criar um novo contacto"
 
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "Propriedades do alarme"
+msgid "Cut selected task"
+msgstr "Apagar este item"
 
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-#~ msgid "File name:"
-#~ msgstr "Nome completo:"
+msgid "Delete selected tasks"
+msgstr "Apagar este item"
 
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_Pastas"
+msgid "New Task"
+msgstr "_Tarefa"
 
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "_Pastas"
+msgid "Paste task from the clipboard"
+msgstr "Colar item da �rea de transfer�ncia"
 
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "Adicionar Fonte"
+msgid "Tasks Settings"
+msgstr "Segundos"
 
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
-#~ msgid "Save"
-#~ msgstr "S�"
+msgid "_Task"
+msgstr "_Tarefa"
 
+#: ui/evolution.xml.h:1
 #, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Apagar"
+msgid "About Evolution..."
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:2
 #, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Assunto"
+msgid "Add to _Shortcut Bar"
+msgstr "Mostrar a barra de atalhos"
+
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr ""
 
+#: ui/evolution.xml.h:6
 #, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Ficheiro n�o encontrado"
+msgid "Copy this folder"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution.xml.h:7
 #, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Encontrar mensagens"
+msgid "Create _New Folder..."
+msgstr "Criar um novo calend�rio"
 
+#: ui/evolution.xml.h:8
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assunto"
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Remover este atalho da barra de atalhos"
 
+#: ui/evolution.xml.h:9
 #, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "N�o se consegui inicializar Bonobo"
+msgid "Create a new folder"
+msgstr "Criar um novo calend�rio"
 
+#: ui/evolution.xml.h:13
 #, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "F_ormato"
+msgid "Delete this folder"
+msgstr "Apagar este item"
+
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
+msgstr "Mostrar uma pasta diferente"
 
+#: ui/evolution.xml.h:15
 #, fuzzy
-#~ msgid "mbox"
-#~ msgstr "Correio novo"
+msgid "E_xit"
+msgstr "Pr�_ximo"
 
+#: ui/evolution.xml.h:16
 #, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:17
 #, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Nenhuma Informa��o"
+msgid "Evolution _Window"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:18
+msgid "Exit the program"
+msgstr ""
 
+#: ui/evolution.xml.h:19
+msgid "Getting _Started"
+msgstr "_Come�ando"
+
+#: ui/evolution.xml.h:20
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:22
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propriedades do alarme"
+msgid "Move this folder to another place"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution.xml.h:24
 #, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Adicionar..."
+msgid "Open in New _Window"
+msgstr "�brir em nova janela"
+
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
+
+#: ui/evolution.xml.h:26
+msgid "Show information about Evolution"
+msgstr ""
 
+#: ui/evolution.xml.h:27
+msgid "Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:28
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:29
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Autentica��o"
+msgid "Toggle whether to show the folder bar"
+msgstr "Mostrar a barra de pastas"
 
+#: ui/evolution.xml.h:32
 #, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autentica��o"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Mostrar a barra de atalhos"
+
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "Nenhuma"
+msgid "Using the C_ontact Manager"
+msgstr "Usando o programa de C_orreio"
+
+#: ui/evolution.xml.h:35
+msgid "Using the _Calendar"
+msgstr "Usando o _Calend�rio"
+
+#: ui/evolution.xml.h:36
+msgid "Using the _Mailer"
+msgstr "Usando o programa de C_orreio"
 
+#: ui/evolution.xml.h:37
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Endere�o de correio:"
+msgid "View the selected folder"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution.xml.h:39
 #, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "Endere�o de correio:"
+msgid "_About Evolution..."
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:41
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configura��o do correio"
+msgid "_Appointment (FIXME)"
+msgstr "_Compromisso"
 
+#: ui/evolution.xml.h:43
 #, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Nome completo:"
+msgid "_Contact (FIXME)"
+msgstr "_Contacto"
 
+#: ui/evolution.xml.h:44
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Utilizador:"
+msgid "_Copy..."
+msgstr "Copiar"
 
+#: ui/evolution.xml.h:49
 #, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correio"
+msgid "_Folder Bar"
+msgstr "_Pasta"
 
+#: ui/evolution.xml.h:50
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "�cone_s pequenos"
+msgid "_Go to Folder..."
+msgstr "Ir para a _pasta..."
 
-#~ msgid "Mail Configuration"
-#~ msgstr "Configura��o do correio"
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Import file..."
+msgstr "Propriedades do alarme"
 
+#: ui/evolution.xml.h:53
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Configura��o do correio"
+msgid "_Index"
+msgstr "�nd_ice de ajuda"
 
+#: ui/evolution.xml.h:54
 #, fuzzy
-#~ msgid "News"
-#~ msgstr "Novo"
+msgid "_Mail message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution.xml.h:55
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_Op��es"
+msgid "_Move..."
+msgstr "Sg"
 
-#~ msgid "Organization:"
-#~ msgstr "Organiza��o:"
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
 
+#: ui/evolution.xml.h:57
 #, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Esquecer _Senhas"
+msgid "_New Folder"
+msgstr "_Nova pasta"
 
+#: ui/evolution.xml.h:58
 #, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Responder"
+msgid "_Rename..."
+msgstr "_Abrir"
 
+#: ui/evolution.xml.h:59
 #, fuzzy
-#~ msgid "Required"
-#~ msgstr "Pessoas _Necess�rias"
+msgid "_Shortcut"
+msgstr "Mudar nome de atalho"
 
+#: ui/evolution.xml.h:60
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Gravar como VCard"
+msgid "_Shortcut Bar"
+msgstr "Mostrar a barra de atalhos"
 
+#: ui/evolution.xml.h:61
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Ficheiro com assinatura:"
+msgid "_Task (FIXME)"
+msgstr "_Contacto"
 
+#: ui/evolution.xml.h:64
 #, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "Configura��o do correio"
+msgid "_Work Offline"
+msgstr "Seg"
 
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Servidor:"
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
 
+#: ui/my-evolution.xml.h:4
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
+msgid "_My Evolution Settings..."
+msgstr "Evolution"
 
-#~ msgid "Signature file:"
-#~ msgstr "Ficheiro com assinatura:"
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Endere�o"
 
+#: views/addressbook/galview.xml.h:2
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Ficheiro com assinatura:"
+msgid "By Company"
+msgstr "Empresa"
 
-#~ msgid "Sources"
-#~ msgstr "Fontes"
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
 
+#: views/mail/galview.xml.h:1
 #, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Nenhuma Informa��o"
+msgid "By Sender"
+msgstr "Enviar"
 
-#~ msgid "Username:"
-#~ msgstr "Utilizador:"
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "S�b"
 
+#: views/mail/galview.xml.h:3
 #, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "Minutos"
+msgid "By Subject"
+msgstr "Assunto"
 
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Mensagem de _correio"
 
-#~ msgid "Email address:"
-#~ msgstr "Endere�o de correio:"
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
 
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "Fontes de correio"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "Transporte de correio"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr "Fora do escrit�rio"
 
-#~ msgid "Add Source"
-#~ msgstr "Adicionar Fonte"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr "Nenhuma Informa��o"
 
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Adicionar novo grupo"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr ""
 
-#~ msgid "Address"
-#~ msgstr "Endere�o"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr "_Op��es"
 
-#, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "atalhos principais"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr ""
 
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte de correio"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "Servidor:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr ""
 
-#, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "Fontes"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Enviar mensagem em formato HTML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr ""
 
-#~ msgid "Delete a contact"
-#~ msgstr "Apagar um contacto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "Find"
-#~ msgstr "Encontrar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr ""
 
-#~ msgid "Find a contact"
-#~ msgstr "Encontrar um contacto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr ""
 
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contactos"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr "Pessoas _Necess�rias"
 
-#, fuzzy
-#~ msgid "View all contacts"
-#~ msgstr "Encontrar um contacto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configura��o do co_rreio..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr "Hora de �n_icio de encontro"
 
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "Imprimir contactos"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
+msgid "Meeting _end time:"
+msgstr "Hora de _fim de _encontro"
 
-#~ msgid "5 Days"
-#~ msgstr "5 Dias"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
+msgid "All Attendees"
+msgstr ""
 
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "Prefer�ncias"
+msgid "_Current View"
+msgstr "Ano corrente (%Y)"
 
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Novo Ca_lend�rio"
+#: widgets/menus/gal-view-menus.c:259
+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
+msgid "MTWTFSS"
+msgstr ""
 
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Prefer�ncias"
+msgid "Now"
+msgstr "Novo"
 
-#~ msgid "Create a new calendar"
-#~ msgstr "Criar um novo calend�rio"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoje"
 
-#~ msgid "Go to"
-#~ msgstr "Ir para"
+#: widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
 
-#~ msgid "Go to a specific date"
-#~ msgstr "Ir para uma data espec�fica"
+#: widgets/misc/e-cell-date-edit.c:731
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
 
-#~ msgid "Month"
-#~ msgstr "M�s"
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
 
-#~ msgid "Open a calendar"
-#~ msgstr "Abrir um calend�rio"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
 
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimir este calend�rio"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
 
-#~ msgid "Show 1 day"
-#~ msgstr "Mostrar 1 dia"
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
 
-#~ msgid "Show 1 month"
-#~ msgstr "Mostrar 1 m�s"
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "Semana"
 
-#~ msgid "Show 1 week"
-#~ msgstr "Mostrar 1 semana"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
 
-#~ msgid "Show the working week"
-#~ msgstr "Mostrar a semana de trabalho"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
 
-#~ msgid "Week"
-#~ msgstr "Semana"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr ""
 
-#~ msgid "_New"
-#~ msgstr "_Novo"
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Abrir Ca_lend�rio"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
 
+#: widgets/misc/e-charset-picker.c:85
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Imprimir este calend�rio"
+msgid "Traditional"
+msgstr "_Op��es"
 
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Novo"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
 #, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Gravar na _pasta..."
+msgid "Other..."
+msgstr "Outro"
 
-#~ msgid "Delete this item"
-#~ msgstr "Apagar este item"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
 
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:157
 #, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Apagar"
+msgid "Search Editor"
+msgstr "_Contacto"
 
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "Imprimir..."
+msgid "Save Search"
+msgstr "Ano"
 
-#~ msgid "Print this item"
-#~ msgstr "Imprimir este item"
+#: widgets/misc/e-filter-bar.c:241
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Adicionar..."
 
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
 
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Gravar na _pasta..."
+msgid "Advanced..."
+msgstr "Adicionar..."
 
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
-#~ msgid "Save and Close"
-#~ msgstr "Guardar Calend�rio como"
+msgid "Information"
+msgstr "Nenhuma Informa��o"
 
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Pasta"
+msgid "Warning"
+msgstr "Seg"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimir..."
+msgid "Question"
+msgstr "Nenhuma descri��o"
 
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Carro"
+msgid "Message"
+msgstr "Mensagem de _correio"
 
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Cortar"
+msgid "Don't show this message again."
+msgstr "Enviar esta mensagem"
+
+#: widgets/misc/e-search-bar.c:155
+msgid "Sear_ch"
+msgstr ""
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Carro"
+msgid "The Personal Addressbook Server"
+msgstr "Adicionar Fonte"
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "Novo compromisso"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "N�o se consegui inicializar Bonobo"
 
-#~ msgid "Copy"
-#~ msgstr "Copiar"
+#: wombat/wombat.c:185
+#, fuzzy
+msgid "init_corba(): could not initialize GNOME"
+msgstr "N�o se consegui inicializar Bonobo"
 
-#~ msgid "Cut"
-#~ msgstr "Cortar"
+#: wombat/wombat.c:198
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "_Compromisso"
+#~ msgid "Set task view preferences"
+#~ msgstr "Prefer�ncias"
 
 #, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Propriedades"
+#~ msgid "TasksPreferences"
+#~ msgstr "Prefer�ncias"
 
-#~ msgid "Paste"
-#~ msgstr "Colar"
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Colar item da �rea de transfer�ncia"
+#~ msgid "Close %s"
+#~ msgstr "Cores"
 
 #, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "Imprimir..."
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Ir para o item anterior"
 
 #, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Propriedades do alarme"
+#~ msgid "Move %s into the next row"
+#~ msgstr "Ir para o pr�ximo item"
 
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Remover"
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "N�o consigo abrir a localiza��o: %s"
 
 #, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Responder"
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
+
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
 
 #, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "Ficheiro com assinatura:"
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998 Free Software Foundation"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
 
 #, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Reponder para todos"
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Um excep��o ocorreu enquanto se tentava carregar dados no componente com "
+#~ "PersistStream"
 
-#~ msgid "Undo"
-#~ msgstr "Anular"
+#, fuzzy
+#~ msgid "_Company:"
+#~ msgstr "Empresa"
 
 #, fuzzy
-#~ msgid "Undo the last action"
-#~ msgstr "Anular a �ltima opera��o"
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Atalho para _barra do Evolution"
 
 #, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Cores"
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Atalho para _barra do Evolution"
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir calend�rio"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gravar calend�rio"
 
 #, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Copiar"
+#~ msgid "Open..."
+#~ msgstr "_Abrir"
 
 #, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Editar..."
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Introduza os receptores da mensagem"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Introduza o assunto da carta"
 
 #, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Encontrar"
+#~ msgid "Save changes to message..."
+#~ msgstr "Enviar uma nova mensagem"
 
 #, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Colar"
+#~ msgid "Remove criterion"
+#~ msgstr "Remover grupo"
 
 #, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Imprimir"
+#~ msgid "Subject contains"
+#~ msgstr "Assunto"
 
 #, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Propriedades do alarme"
+#~ msgid "Move to Folder..."
+#~ msgstr "Ir para a _pasta..."
 
 #, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Anular"
+#~ msgid "Copy to Folder..."
+#~ msgstr "Ir para a _pasta..."
 
 #, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Cores"
+#~ msgid "Closing current folder"
+#~ msgstr "Fechar o calend�rio corrente"
 
 #, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Criar uma nova mensagem"
+#~ msgid "(No description)"
+#~ msgstr "Nenhuma descri��o"
 
 #, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "Enviar esta mensagem"
 
 #, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_Pastas"
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Enviar esta mensagem"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros do Evolution instalados com sucesso"
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
 
-#~ msgid "Forget _Passwords"
-#~ msgstr "Esquecer _Senhas"
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atalho"
 
 #, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "_Correio"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Compromisso"
 
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Imprimir a mensagem seleccionada"
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "Pedido de _encontro"
 
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Novas mensagens de correio"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimir a mensagem seleccionada"
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "_Pedido de tarefa"
 
 #, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "Dru�da dos _filtros"
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "_Entrada di�ria?"
 
 #, fuzzy
-#~ msgid "Move"
-#~ msgstr "Sg"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "Pedido de _encontro"
 
 #, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "Adicionar anexo..."
+
+#~ msgid "_Object"
+#~ msgstr "_Objecto"
 
 #, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "Prever impress�o"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "_Contacto"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Ferramentas"
 
 #, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Encontrar mensagens"
+#~ msgid "_Forms"
+#~ msgstr "_Pasta"
 
 #, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Reponder para todos"
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Reponder para todos"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "Reponder para todos"
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Novas mensagens de correio"
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Ir para a _pasta..."
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "_Entrada di�ria?"
 
 #, fuzzy
-#~ msgid "_Edit Message"
+#~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "Mensagem de _correio"
 
 #, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configura��o do co_rreio..."
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "Mensagem de _correio"
+
+#~ msgid "Actio_ns"
+#~ msgstr "_Ac��es"
 
 #, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Mensagem de _correio"
+#~ msgid "FIXME: Previous"
+#~ msgstr "An_terior"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir para o item anterior"
 
 #, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Ir para a _pasta..."
+#~ msgid "FIXME: Next"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "�brir em nova janela"
+#~ msgid "Find..."
+#~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Encontrar mensagens"
+#~ msgid "TaskPad"
+#~ msgstr "_Tarefa"
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Fontes"
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes"
 
 #, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Apagar"
+#~ msgid "Appointment Basics"
+#~ msgstr "Compromissos:"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
 #, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "_Pastas"
+#~ msgid "Mail _to:"
+#~ msgstr "atalhos principais"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-#~ msgid "Attach"
-#~ msgstr "Anexar"
+#~ msgid "_Mail"
+#~ msgstr "_Correio"
 
 #, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Fechar o calend�rio corrente"
+#~ msgid "Hide deleted"
+#~ msgstr "Apagar"
+
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Ficheiro n�o encontrado"
 
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Enviar a mensagem"
+#~ msgid "Account Properties"
+#~ msgstr "Propriedades do alarme"
 
 #, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Anexar um ficheiro � mensagem"
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configura��o do correio"
 
 #, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Abrir ficheiro"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Configura��o do correio"
 
 #, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Guardar Calend�rio como"
+#~ msgid "Reply-to:"
+#~ msgstr "Responder"
 
 #, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Gravar na _pasta..."
+#~ msgid "Required"
+#~ msgstr "Pessoas _Necess�rias"
 
 #, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Gravar na _pasta..."
+#~ msgid "Save password"
+#~ msgstr "Gravar como VCard"
 
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "Full name:"
+#~ msgstr "Nome completo:"
 
-#~ msgid "Send"
-#~ msgstr "Enviar"
+#~ msgid "Email address:"
+#~ msgstr "Endere�o de correio:"
 
 #, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar mensagem em formato HTML"
+#~ msgid "Mail source type:"
+#~ msgstr "Fontes de correio"
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Enviar a mensagem"
+#~ msgid "Mail transport type:"
+#~ msgstr "Transporte de correio"
 
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Enviar a mensagem"
+#~ msgid "Add Source"
+#~ msgstr "Adicionar Fonte"
 
 #, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Enviar esta mensagem"
+#~ msgid "Mail Sources"
+#~ msgstr "atalhos principais"
 
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Ver/esconder anexos"
+#~ msgid "Mail Transport"
+#~ msgstr "Transporte de correio"
 
 #, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "Ver _anexos"
+#~ msgid "News Sources"
+#~ msgstr "Fontes"
+
+#~ msgid "Find a contact"
+#~ msgstr "Encontrar um contacto"
 
 #, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Enviar esta mensagem"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configura��o do co_rreio..."
 
 #, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Abrir"
+#~ msgid "_Print Contacts..."
+#~ msgstr "Imprimir contactos"
 
-#~ msgid "Display a different folder"
-#~ msgstr "Mostrar uma pasta diferente"
+#~ msgid "5 Days"
+#~ msgstr "5 Dias"
 
 #, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "Pr�_ximo"
+#~ msgid "Ca_lendar"
+#~ msgstr "Novo Ca_lend�rio"
 
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Atalho para _barra do Evolution"
+#~ msgid "Create a new calendar"
+#~ msgstr "Criar um novo calend�rio"
 
-#~ msgid "Getting _Started"
-#~ msgstr "_Come�ando"
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir um calend�rio"
 
 #, fuzzy
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Mostrar a barra de pastas"
+#~ msgid "_Open Calendar"
+#~ msgstr "Abrir Ca_lend�rio"
 
 #, fuzzy
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Mostrar a barra de pastas"
+#~ msgid "_Print this calendar"
+#~ msgstr "Imprimir este calend�rio"
 
 #, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Mostrar a barra de atalhos"
+#~ msgid "C_lear"
+#~ msgstr "Carro"
 
 #, fuzzy
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Usando o programa de C_orreio"
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "_Compromisso"
 
-#~ msgid "Using the _Calendar"
-#~ msgstr "Usando o _Calend�rio"
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "Remover"
 
-#~ msgid "Using the _Mailer"
-#~ msgstr "Usando o programa de C_orreio"
+#~ msgid "Undo"
+#~ msgstr "Anular"
 
 #, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolution"
+#~ msgid "_Find..."
+#~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Compromisso"
+#~ msgid "_Undo"
+#~ msgstr "Anular"
 
 #, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacto"
+#~ msgid "Get Mail"
+#~ msgstr "_Correio"
 
-#~ msgid "_Folder"
-#~ msgstr "_Pasta"
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "Prever impress�o"
 
 #, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Ir para a _pasta..."
+#~ msgid "Reply to _Sender"
+#~ msgstr "Reponder para todos"
+
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "Encontrar mensagens"
 
 #, fuzzy
-#~ msgid "_Index"
-#~ msgstr "�nd_ice de ajuda"
+#~ msgid "_Source"
+#~ msgstr "Fontes"
 
 #, fuzzy
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "Mensagem de _correio"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Mostrar a barra de pastas"
 
 #~ msgid "Headings:"
 #~ msgstr "Cabe�alhos:"
 
-#~ msgid "Empty days:"
-#~ msgstr "Dias vazios:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Compromissos:"
-
 #, fuzzy
 #~ msgid "may"
 #~ msgstr "Dia"
@@ -6162,10 +12459,6 @@ msgstr "Grupo %i"
 #~ msgstr "Hoje"
 
 #, fuzzy
-#~ msgid "last"
-#~ msgstr "Colar"
-
-#, fuzzy
 #~ msgid "next"
 #~ msgstr "Pr�_ximo"
 
@@ -6174,10 +12467,6 @@ msgstr "Grupo %i"
 #~ msgstr "Outro"
 
 #, fuzzy
-#~ msgid "fourth"
-#~ msgstr "Hora"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "Imprimir"
 
@@ -6189,10 +12478,6 @@ msgstr "Grupo %i"
 #~ msgstr "Ano:"
 
 #, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "atalhos principais"
-
-#, fuzzy
 #~ msgid "Send \"%s\""
 #~ msgstr "Segundos"
 
@@ -6205,16 +12490,9 @@ msgstr "Grupo %i"
 #~ msgstr "Sincronizar"
 
 #, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#, fuzzy
 #~ msgid "Rebuild message view"
 #~ msgstr "Encontrar mensagens"
 
-#~ msgid "_Actions"
-#~ msgstr "_Ac��es"
-
 #, fuzzy
 #~ msgid "_Save Calendar As"
 #~ msgstr "Guardar Calend�rio como"
@@ -6235,15 +12513,9 @@ msgstr "Grupo %i"
 #~ msgid "_Close Calendar"
 #~ msgstr "_Fechar Calend�rio"
 
-#~ msgid "_New appointment..."
-#~ msgstr "_Novo compromisso..."
-
 #~ msgid "New appointment for _today..."
 #~ msgstr "Novo compromisso para _hoje..."
 
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Criar um novo compromisso para hoje"
-
 #~ msgid "About Calendar"
 #~ msgstr "Sobre o calend�rio"
 
@@ -6270,15 +12542,9 @@ msgstr "Grupo %i"
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Cortar item seleccionado para a �rea de transfer�ncia"
 
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Copiar item seleccionada para a �rea de transfer�ncia"
-
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Seleccionar o endere�o dos receptores"
 
-#~ msgid "Discard this message?"
-#~ msgstr "Descartar esta mensagem?"
-
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Cortar a regi�o seleccionada para a �rea de transfer�ncia"
 
@@ -6288,15 +12554,9 @@ msgstr "Grupo %i"
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "Colar a regi�o seleccionada para a �rea de transfer�ncia"
 
-#~ msgid "Check for new mail"
-#~ msgstr "Verificar novo correio"
-
 #~ msgid "Composes a new mail message"
 #~ msgstr "Criar uma nova mensagem"
 
-#~ msgid "Task _Request"
-#~ msgstr "_Pedido de tarefa"
-
 #~ msgid "_Journal Entry"
 #~ msgstr "_Entrada di�ria?"
 
@@ -6340,18 +12600,9 @@ msgstr "Grupo %i"
 #~ "Pedimos desculpa. O navegador de pastas do Evolution n�o pode ser "
 #~ "inicializado."
 
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "Se uma previs�o da mensagem deve ser mostrada"
-
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "O componente %s n�o suporta PersistStream!\n"
 
-#~ msgid "A folder containing mail items"
-#~ msgstr "Uma pasta contendo items de correio"
-
-#~ msgid "A folder containing contacts"
-#~ msgstr "Uma pasta contendo contactos"
-
 #~ msgid "A folder containing calendar entries"
 #~ msgstr "Uma pasta contendo entradas de calend�rio"
 
@@ -6370,21 +12621,9 @@ msgstr "Grupo %i"
 #~ msgid "Rename Group"
 #~ msgstr "Mudar nome de grupo"
 
-#~ msgid "Advanced Find"
-#~ msgstr "Encontrar avan�ado"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Mudar nome de atalho"
-
 #~ msgid "Executive Summary"
 #~ msgstr "Sum�rio executivo"
 
-#~ msgid "Your contacts list"
-#~ msgstr "A sua lista de contactos"
-
-#~ msgid "Tasks list"
-#~ msgstr "Lista de tarefas"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "Liga algumas fun��es de deupra��o"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b27e463cb5..95e4824a95 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2001.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-26 17:19-0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-01-26 17:42-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"
@@ -14,733 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Adicionar servi�o"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Adicionar um novo servi�o ao Executive Summary"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Criar um novo correio eletr�nico"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Configura��es do Executive Summary..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova mensagem"
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "N�o � poss�vel iniciar o componente Executive Summary do Evolution."
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "N�o existe tal mensagem: %s"
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Voc� pode selecionar uma p�gina HTML diferente para o fundo do Executive "
-"Summary.\n"
-"\n"
-"Apenas deixe-o vazio para o padr�o"
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s com o aplicativo Gnome padr�o"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s com o navegador web Gnome padr�o"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar uma mensagem para %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Mudar a visualiza��o para %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Fechar %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s para a direita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s para a linha anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mover %s para a pr�xima linha"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
 msgstr ""
-"N�o � poss�vel abrir o arquivo HTML:\n"
-"%s"
 
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
 msgstr ""
-"Erro ao ler dados:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Arquivo n�o possui um lugar para os servi�os.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O componente Executive Summary n�o pode iniciar o Bonobo.\n"
-"Se ocorreu uma mensagem de alerta sobre o RootPOA, isto provavelmente\n"
-"significa voc� compilou Bonobo com GOAD no lugar de OAF."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-msgid "Error"
-msgstr "Erro"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr "Conectando ao servidor"
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr "Conectar ao servidor"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Sobre este aplicativo"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Sobre..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_A��es"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "C_lear"
-msgstr "_Limpar"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:5
-msgid "C_ut"
-msgstr "Recor_tar"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:6
-msgid "Clear"
-msgstr "Limpar"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:7
-msgid "Clear the selection"
-msgstr "Limpar a sele��o"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:8 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Fechar"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:9
-msgid "Close the current file"
-msgstr "Fechar o arquivo atual"
-
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:10
-msgid "Copy"
-msgstr "Copiar"
-
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-task-editor-dialog.xml.h:11
-msgid "Copy the selection"
-msgstr "Copiar a sele��o"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:12
-msgid "Cut"
-msgstr "Recortar"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cut the selection"
-msgstr "Recortar a sele��o"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:403
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:14
-msgid "Delete"
-msgstr "Excluir"
-
-#: ui/evolution-task-editor-dialog.xml.h:15
-msgid "Delete this task"
-msgstr "Excluir esta tarefa"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Dump XML"
-msgstr "Descarregar XML"
-
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Descarregar a descri��o de IU XML"
-
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor-dialog.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _Cat�logo de endere�os..."
-
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: Atri_buir tarefa"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Escolher _formul�rio..."
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: _Verificar nomes"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: _Copiar para pasta..."
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Projetar um formul�rio..."
-
-#: ui/evolution-event-editor.xml.h:23 ui/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Definir estilos de _impress�o"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Pro_jetar este formul�rio"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rimeiro item na pasta"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: For_ward"
-msgstr "FIXME: E_ncaminhar"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: Help"
-msgstr "FIXME: Ajuda"
-
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Tarefa imcom_pleta"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "FIXME: Inserir arquivo"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
-
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: _Pedido de reuni�o"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Colar e_special..."
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Visuali_zar impress�o"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar formul�rio como..."
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _formul�rio..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _Repeti��o..."
-
-#: ui/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Responder a _todos"
-
-#: ui/evolution-event-editor.xml.h:37 ui/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: S_end"
-msgstr "FIXME: En_viar"
-
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: En_viar relat�rio de estado"
-
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: Pu_lar ocorr�ncia"
-
-#: ui/evolution-event-editor.xml.h:38 ui/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Salvar ane_xo..."
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de scripts"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: Task _Request"
-msgstr "FIXME: _Pedido de tarefa"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Compromisso"
-
-#: ui/evolution-event-editor.xml.h:41 ui/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contato"
-
-#: ui/evolution-event-editor.xml.h:42 ui/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
-
-#: ui/evolution-event-editor.xml.h:43 ui/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Arquivo..."
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
-
-#: ui/evolution-event-editor.xml.h:45 ui/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Formata��o"
-
-#: ui/evolution-event-editor.xml.h:46 ui/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
-
-#: ui/evolution-event-editor.xml.h:47 ui/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Item de _di�rio"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: �l_timo item na pasta"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mensagem de correio"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: _Marcar como cumprida"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Estilo de _memorando"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para pasta..."
-
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _New Task"
-msgstr "FIXME: _Nova tarefa"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objeto..."
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Par�grafo..."
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Reply"
-msgstr "FIXME: _Responder"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografia..."
-
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Padr�o"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: ui/evolution-event-editor.xml.h:59 ui/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Item _n�o lido"
-
-#: ui/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _note"
-msgstr "FIXME: _nota"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: what goes here?"
-msgstr "FIXME: o que vai aqui?"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "Find"
-msgstr "Localizar"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:70
-msgid "Find Again"
-msgstr "Localizar novamente"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:71
-msgid "Find _Again"
-msgstr "Localizar _novamente"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:72
-msgid "Go to the next item"
-msgstr "Vai para o pr�ximo item"
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-task-editor-dialog.xml.h:73
-msgid "Go to the previous item"
-msgstr "Vai para o item anterior"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:74
-msgid "Modify the file's properties"
-msgstr "Modificar as propriedades do arquivo"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:75
-msgid "N_ext"
-msgstr "P_r�ximo"
-
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:76
-msgid "Next"
-msgstr "Pr�ximo"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:77
-msgid "Paste"
-msgstr "Colar"
-
-#: ui/evolution-event-editor.xml.h:71 ui/evolution-task-editor-dialog.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Colar a �rea de transfer�ncia"
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:79
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:80
-msgid "Previous"
-msgstr "Anterior"
-
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:81
-msgid "Print S_etup..."
-msgstr "Configurar i_mpress�o..."
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:82
-msgid "Print Setup"
-msgstr "Configurar impress�o..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "Print this item"
-msgstr "Imprime este item"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-event-editor.xml.h:78 ui/evolution-task-editor-dialog.xml.h:85
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ui/evolution-event-editor.xml.h:79 ui/evolution-task-editor-dialog.xml.h:86
-msgid "Redo"
-msgstr "Refazer"
-
-#: ui/evolution-event-editor.xml.h:80 ui/evolution-task-editor-dialog.xml.h:87
-msgid "Redo the undone action"
-msgstr "Refazer a a��o desfeita"
-
-#: ui/evolution-event-editor.xml.h:81 ui/evolution-task-editor-dialog.xml.h:88
-msgid "Replace"
-msgstr "Substituir"
-
-#: ui/evolution-event-editor.xml.h:82 ui/evolution-task-editor-dialog.xml.h:89
-msgid "Replace a string"
-msgstr "Substituir uma express�o"
-
-#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:90
-msgid "Save"
-msgstr "Salvar"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:91
-msgid "Save _As..."
-msgstr "Salvar _como..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-#: ui/evolution-task-editor-dialog.xml.h:92
-msgid "Save and Close"
-msgstr "Salvar e fechar"
-
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:93
-msgid "Save the current file"
-msgstr "Salvar o arquivo atual"
-
-#: ui/evolution-task-editor-dialog.xml.h:94
-msgid "Save the task and close the dialog box"
-msgstr "Salva a tarefa e fecha a caixa de di�logo"
-
-#: ui/evolution-event-editor.xml.h:91 ui/evolution-task-editor-dialog.xml.h:95
-msgid "Search again for the same string"
-msgstr "Buscar novamente pela mesma espress�o"
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-task-editor-dialog.xml.h:96
-msgid "Search for a string"
-msgstr "Buscar por uma express�o"
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:97
-msgid "See online help"
-msgstr "Ver ajuda on-line"
-
-#: ui/evolution-event-editor.xml.h:94 ui/evolution-task-editor-dialog.xml.h:98
-msgid "Select All"
-msgstr "Selecionar todos"
-
-#: ui/evolution-event-editor.xml.h:95 ui/evolution-task-editor-dialog.xml.h:99
-msgid "Select everything"
-msgstr "Selecionar tudo"
-
-#: ui/evolution-event-editor.xml.h:96
-#: ui/evolution-task-editor-dialog.xml.h:100
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar a p�gina para a sua impressora atual"
-
-#: ui/evolution-event-editor.xml.h:97
-#: ui/evolution-task-editor-dialog.xml.h:101
-msgid "Undo"
-msgstr "Desfazer"
-
-#: ui/evolution-event-editor.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:102
-msgid "Undo the last action"
-msgstr "Desfazer a �ltima a��o"
-
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:103
-msgid "_About..."
-msgstr "_Sobre..."
-
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:104 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ui/evolution-event-editor.xml.h:101
-#: ui/evolution-task-editor-dialog.xml.h:105
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:106
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:107
-msgid "_Delete"
-msgstr "_Excluir"
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:108
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:109 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Arquivo"
-
-#: ui/evolution-event-editor.xml.h:106
-#: ui/evolution-task-editor-dialog.xml.h:110
-msgid "_Find..."
-msgstr "_Localizar..."
-
-#: ui/evolution-event-editor.xml.h:107
-#: ui/evolution-task-editor-dialog.xml.h:111
-msgid "_Forms"
-msgstr "_Formul�rios"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:112 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "Aj_uda"
-
-#: ui/evolution-event-editor.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:113
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ui/evolution-event-editor.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:114
-msgid "_Object"
-msgstr "_Objeto"
-
-#: ui/evolution-event-editor.xml.h:111
-#: ui/evolution-task-editor-dialog.xml.h:115
-msgid "_Paste"
-msgstr "C_olar"
-
-#: ui/evolution-event-editor.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:116 ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimir"
-
-#: ui/evolution-event-editor.xml.h:113
-#: ui/evolution-task-editor-dialog.xml.h:117
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: ui/evolution-event-editor.xml.h:114
-#: ui/evolution-task-editor-dialog.xml.h:118
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: ui/evolution-event-editor.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:119
-msgid "_Replace..."
-msgstr "_Substituir..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:120
-msgid "_Save"
-msgstr "_Salvar"
-
-#: ui/evolution-event-editor.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:121
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
-#: ui/evolution-task-editor-dialog.xml.h:122
-msgid "_Tools"
-msgstr "_Ferramentas"
-
-#: ui/evolution-event-editor.xml.h:119
-#: ui/evolution-task-editor-dialog.xml.h:123
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: shell/e-storage-set-view.c:338 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:124 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Visualizar"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Mudar prefer�ncias"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Novo"
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimir"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Salvar tarefa como outra coisa"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Prefer�ncias da tarefa..."
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Salvar _como..."
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Cart�o: "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -748,7 +33,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -756,7 +41,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -764,7 +49,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -772,7 +57,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -780,7 +65,7 @@ msgstr ""
 "\n"
 "  Fam�lia:    "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -788,7 +73,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -796,7 +81,7 @@ msgstr ""
 "\n"
 "Data de nascimento: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -804,7 +89,7 @@ msgstr ""
 "\n"
 "Endere�o:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -812,7 +97,7 @@ msgstr ""
 "\n"
 "  Caixa postal:"
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -820,7 +105,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -828,7 +113,7 @@ msgstr ""
 "\n"
 "  Rua:         "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -836,7 +121,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -844,7 +129,7 @@ msgstr ""
 "\n"
 "  Regi�o:      "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -852,7 +137,7 @@ msgstr ""
 "\n"
 "  C�digo postal:"
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -860,7 +145,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -868,7 +153,7 @@ msgstr ""
 "\n"
 "R�tulo de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -876,7 +161,7 @@ msgstr ""
 "\n"
 "Telefones:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -884,7 +169,7 @@ msgstr ""
 "\n"
 "Telefone:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -892,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -900,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -908,7 +193,7 @@ msgstr ""
 "\n"
 "Agente de correio: "
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -916,7 +201,7 @@ msgstr ""
 "\n"
 "Fuso hor�rio: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -924,7 +209,7 @@ msgstr ""
 "\n"
 "Localiza��o geogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -932,7 +217,7 @@ msgstr ""
 "\n"
 "Cargo comercial: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -940,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -948,7 +233,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -956,7 +241,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -964,7 +249,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -972,7 +257,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -980,7 +265,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -988,7 +273,7 @@ msgstr ""
 "\n"
 "Categorias: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -1006,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -1014,7 +299,7 @@ msgstr ""
 "\n"
 "String �nica: "
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -1022,137 +307,26 @@ msgstr ""
 "\n"
 "Chave p�blica: "
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "N�o foi poss�vel iniciar Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Desativado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar a partir do pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar para o pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mesclar a partir do pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mesclar para o pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Canal para cat�logo de endere�os do Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
-"Utilit�rio de configura��o do canal para cat�logo de endere�os do "
-"Evolution.\n"
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "A��o ao sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado do canal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nenhum pilot configurado, por favor visite primeiramente\n"
-"o painel Pilot Link na central de controle."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "N�o conectado ao daemon Gnome Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ocorreu um erro ao tentar ler a lista de\n"
-"pilots a partir do daemon Gnome Pilot"
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Entre senha para %s"
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+msgid "Could not initialize Bonobo"
+msgstr "N�o foi poss�vel iniciar Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -1162,598 +336,881 @@ 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:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "N�o foi poss�vel iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "N�o foi poss�vel iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 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"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Excluir contato?"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"Utilit�rio de configura��o do canal para cat�logo de endere�os do "
+"Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Canal para cat�logo de endere�os do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+"Utilit�rio de configura��o do canal para cat�logo de endere�os do "
+"Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Clique aqui para o cat�logo de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Arquivo"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo de cat�logo de endere�os desconhecido"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Nenhum (modo an�nimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Senha"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo de autentica��o desconhecido"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Um"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Sub�rvore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo de escopo desconhecido"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Vincular DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar esta senha"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "M�quina:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN raiz:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porta:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Escopo de busca:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentica��o:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Caminho:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+#, fuzzy
+msgid "FIXME Path Help text here"
+msgstr "FIXME: o que vai aqui?"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Criar caminho se ele n�o existir."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editar cat�logo de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Incluir cat�logo de endere�os"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Selecione o tipo de cat�logo de endere�os voc� possui e entre os dados sobre "
+"ele."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descri��o"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
+msgstr "Fontes de cat�logos de endere�os"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Excluir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
 msgid "_Add"
 msgstr "_Incluir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de telefone"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Novo tipo de telefone"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Outros contatos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Incluir"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Entre senha para %s"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Editor de contatos"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "N�o � poss�vel abrir o cat�logo de endere�os"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nome _completo..."
+#: addressbook/gui/component/addressbook.c:380
+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/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Arquivar como:"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Endere�o de p�gina web:"
+#: addressbook/gui/component/addressbook.c:393
+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/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Deseja receber correio _HTML"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Qualquer campo cont�m"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Comercial"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nome cont�m"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Residencial"
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-mail cont�m"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax comercial"
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nome cont�m"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "Cel_ular"
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "A URI que o navegador de pastas vai exibir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "E-mail principal"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Executar a��es"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar novo contato"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editar cat�logo de endere�os"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Outros contatos"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Endere�o eletr�nico:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Desativado"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Canal para cat�logo de endere�os do Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Remover"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Remover"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Outros contatos"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinat�rios da mensagem"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Selecionar nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Selecionar nome de:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categoria:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
+msgstr "_Bodas:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "C_omercial"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "E_ste � o endere�o de correspond�ncia"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "Co_ntatos..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
+msgstr "_Fax comercial"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/event-editor-dialog.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "C_argo:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
+msgstr "Editor de contatos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "E_mpresa:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
+msgstr "Detalhes"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Endere�o..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
+msgstr "Arquivar como:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Departamento:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
+msgstr "Novo tipo de telefone"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_Escrit�rio:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "No_tes:"
+msgstr "_Notas:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_Profiss�o:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Empresa:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Apelido:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
+msgstr "Tipos de telefone"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_C�njuge:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
+msgstr "Deseja receber correio _HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Ani_vers�rio:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
+msgstr "Endere�o de p�gina web:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
+msgstr "_Endere�o..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome do a_ssistente:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
+msgstr "Ani_vers�rio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
+msgstr "_Comercial"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "Co_ntatos..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+msgid "_Delete"
+msgstr "_Excluir"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
+msgstr "_Departamento:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
+msgstr "Nome _completo..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Home"
+msgstr "_Residencial"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
+msgstr "C_argo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome do _gerente:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "_Bodas:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
+msgstr "Cel_ular"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "_Notas:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
+msgstr "_Apelido:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detalhes"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
+msgstr "_Escrit�rio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
+msgstr "_Profiss�o:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
+msgstr "_C�njuge:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
+msgstr "E_ste � o endere�o de correspond�ncia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Excluir contato?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistente:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Comercial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Comercial 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax comercial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Callback"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Residencial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Residencial 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax residencial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Celular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: mail/mail-config.glade.h:45
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "E-mail 2"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "E-mail 3"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#, fuzzy
+msgid "Edit Full"
+msgstr "Editar filtros"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Endere�o _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canad�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Verificar endere�o"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Pa�s:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finl�ndia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "EUA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Endere�o:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Cai_xa postal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "E_stado:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "CEP/C�di_go postal:"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Verificar nome completo"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"Senhorita\n"
-"Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Nome:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tratamento:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "Nome do _meio:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Sobrenome:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "S_ufixo:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Como _minicart�es"
-
-#: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como _tabela"
-
-#: addressbook/gui/component/addressbook.c:406
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entre senha para %s"
-
-#: addressbook/gui/component/addressbook.c:434
-msgid "Unable to open addressbook"
-msgstr "N�o � poss�vel abrir o cat�logo de endere�os"
-
-#: addressbook/gui/component/addressbook.c:439
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"N�o foi poss�vel abrir este cat�logo de endere�os. Isto \n"
-"significa que voc� forneceu uma URI incorreta ou tentou\n"
-"acessar um servidor LDAP sem que o suporte para LDAP esteja\n"
-"compilado. Se voc� entrou uma URI, verifique a URI e tente \n"
-"novamente. Caso contr�rio, voc� provavelmente tentou\n"
-"acessar um servidor LDAP. Se voc� quiser usar LDAP, voc�\n"
-"vai precisar baixar e instalar OpenLDAP e recompilar e\n"
-"instalar Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Exibir todos"
 
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "Avan�ado..."
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Any field contains"
-msgstr "Qualquer campo cont�m"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Name contains"
-msgstr "Nome cont�m"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Email contains"
-msgstr "E-mail cont�m"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#, fuzzy
+msgid "I"
+msgstr "Se"
 
-#: addressbook/gui/component/addressbook.c:739
-msgid "The URI that the Folder Browser will display"
-msgstr "A URI que o navegador de pastas vai exibir"
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Outros contatos"
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:141
-msgid "File"
-msgstr "Arquivo"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "�"
 
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr "Tipo de cat�logo de endere�os desconhecido"
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr "Nenhum (modo an�nimo)"
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Senha"
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr "SASL"
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr "Tipo de autentica��o desconhecido"
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Nome:"
 
-#: addressbook/gui/component/addressbook-config.c:169
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Sobrenome:"
 
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr "Um"
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "Nome do _meio:"
 
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr "Sub�rvore"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr "S_ufixo:"
 
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr "Tipo de escopo desconhecido"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr "Vincular DN:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome da m�quina:"
 
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr "Lembrar esta senha"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Dezembro"
 
-#: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config.glade.h:27
-msgid "Host:"
-msgstr "M�quina:"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:361
-msgid "Port:"
-msgstr "Porta:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "DN raiz:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Remover"
 
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr "Escopo de busca:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contatos"
 
-#: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "Autentica��o:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contatos"
 
-#: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.c:460 mail/mail-config.glade.h:48
-msgid "Path:"
-msgstr "Caminho:"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr "Criar caminho se ele n�o existir."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr "Editar cat�logo de endere�os"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr "Incluir cat�logo de endere�os"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Autor original:"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Selecione o tipo de cat�logo de endere�os voc� possui e entre os dados sobre "
-"ele."
 
-#: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config.glade.h:40
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descri��o"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Fontes de cat�logos de endere�os"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:670
-#: mail/mail-config.glade.h:22
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Localizar..."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Outros contatos"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinat�rios da mensagem"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecionar nomes"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selecionar nome de:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1865,64 +1322,273 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Salvar como vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+#, fuzzy
+msgid "Send contact to other"
+msgstr "E_nviar o contato a outro..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Enviar _mensagem ao contato..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "Imprimir"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimir en_velope..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Excluir"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "<b>Erro ao carregar agenda</b>"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fontes"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permiss�o negada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Arquivo n�o encontrado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Opera��o n�o suportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erro de E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erro ao carregar arquivo: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr ""
+"Erro ao ler dados:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erro ao carregar arquivo: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erro ao ler arquivo de correio: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Erro ao ler dados:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#, fuzzy
+msgid "* Click here to add a contact *"
+msgstr "<clique aqui para selecionar uma data>"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+#, fuzzy
+msgid "File As"
+msgstr "Arquivar como:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistente:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+#, fuzzy
+msgid "Business Phone"
+msgstr "Comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Callback"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+#, fuzzy
+msgid "Home Phone"
+msgstr "Residencial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "Comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+#, fuzzy
+msgid "Home Address"
+msgstr "Verificar endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Celular"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Residencial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+#, fuzzy
+msgid "Other Phone"
+msgstr "Outros contatos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+#, fuzzy
+msgid "Other Address"
+msgstr "Verificar endere�o"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Escrit�rio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Tratamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profiss�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Gerente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Apelido"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "C�njuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL livre-ocupado"
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Terminado"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Salvar no cat�logo de endere�os"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1936,6 +1602,11 @@ msgstr ""
 "\n"
 "Clique duas vezes aqui para criar um novo contato."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#, fuzzy
+msgid "Card View"
+msgstr "Cart�o: "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -1961,7 +1632,8 @@ msgid "Dimensions:"
 msgstr "Tamanho:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -2092,7 +1764,7 @@ msgstr "Nome do estilo:"
 msgid "Top:"
 msgstr "Superior:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:70
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -2101,123 +1773,324 @@ msgid "Width:"
 msgstr "Largura:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Canal para agenda do Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "Utilit�rio de configura��o do canal para agenda do Evolution.\n"
+#, fuzzy
+msgid "_Font..."
+msgstr "Fonte..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao comunicar com o servidor de agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "N�o foi poss�vel ler os dados do aplicativo de agenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Canal para tarefas do Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "Utilit�rio de configura��o do canal para tarefas do Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "N�o foi poss�vel ler os dados do aplicativo de tarefas do pilot"
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Arquivo n�o encontrado"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir agenda"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "N�o � poss�vel iniciar o componente Executive Summary do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Canal para agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Utilit�rio de configura��o do canal para agenda do Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Salvar agenda"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Exibir informa��o sobre o Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarme em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Fechar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editar compromisso"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Sem resumo dispon�vel."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+#, fuzzy
+msgid "Reminder of your appointment at "
+msgstr "Lembre-me de todos os compromissos"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
 msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
 msgstr ""
-"N�o foi poss�vel criar a visualiza��o da agenda. Por favor verifique a "
-"configura��o do seu ORBit e OAF."
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "N�o foi poss�vel iniciar Gnome"
 
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "N�o foi poss�vel iniciar Bonobo"
 
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
+
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e de %B de %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-model.c:374
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"N�o foi poss�vel criar a visualiza��o da agenda. Por favor verifique a "
+"configura��o do seu ORBit e OAF."
+
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:377
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/calendar-model.c:380
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+msgid "High"
+msgstr "Alta"
+
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+msgid "Low"
+msgstr "Baixa"
+
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
+msgid "Not Started"
+msgstr "N�o iniciada"
+
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
+msgid "In Progress"
+msgstr "Em progresso"
+
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
+msgid "Completed"
+msgstr "Cumprida"
+
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+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:896 e-util/e-time-utils.c:316
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2228,36 +2101,27 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
+msgid "None"
+msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2267,73 +2131,300 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "A prioridade deve estar entre 1 e 9, inclusive"
+#: calendar/gui/calendar-model.c:1168
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr "%A, %e de %B de %Y"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
+msgid "Undefined"
+msgstr "Indefinido"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr "%H:%M"
+#: calendar/gui/calendar-model.c:1222
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erro ao carregar agenda</b>"
+#: calendar/gui/calendar-model.c:1710
+#, fuzzy
+msgid "Recurring"
+msgstr "Repeti��o"
 
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro ao carregar agenda:<br>M�todo n�o suportado"
+#: calendar/gui/calendar-model.c:1712
+#, fuzzy
+msgid "Assigned"
+msgstr "Atribuir pontua��o"
 
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr "Exibi��o"
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
+msgid "Yes"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
-msgid "Show appointments"
-msgstr "Exibir compromissos"
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
+#, fuzzy
+msgid "No"
+msgstr "Agora"
 
-#: calendar/gui/calendar-summary.c:497
-msgid "Show tasks"
-msgstr "Exibir tarefas"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Visualizar"
 
-#: calendar/gui/calendar-summary.c:583
-msgid "Loading Calendar"
-msgstr "Carregando agenda"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana �til"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/calendar-view-factory.c:155 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
+#, fuzzy
+msgid "Month View"
+msgstr "M�s"
+
+#: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "A URI que a agenda vai exibir"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme em %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmes aud�veis"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notifica��o sobre seu compromisso em %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinat�rios da mensagem"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Sem resumo dispon�vel."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Op��es de exibi��o"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editar compromisso"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Adiar"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Corpo da mensagem"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Senha:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "E_xecutar programa:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dias"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "dias"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "dia"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr "segundo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "_Mensagem de correio"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "Enviar uma mensagem para %s"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#, fuzzy
+msgid "Run a program"
+msgstr "E_xecutar programa:"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Lembre-me de todos os compromissos"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Lembretes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "R_esumo:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Op��es"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "ap�s"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "antes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dia(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "Editar compromisso"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -2364,35 +2455,38 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmes param ap�s"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes aud�veis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Soe um bip quando janelas de alarme aparecerem."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Prefer�ncias da agenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Cores"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Op��es do navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2400,680 +2494,1169 @@ msgid "Defaults"
 msgstr "Padr�es"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Op��es de exibi��o"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Exibi��o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Prazo de conclus�o"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Permitir adiamento por"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "T�rmino do dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primeiro dia da semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "sex"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Real�ar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Tarefas com prazo para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Tarefas com prazo para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Tarefas com prazo ainda n�o vencido"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Tarefas com prazo ainda n�o vencido"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:436
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Tarefas atrasadas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
 msgstr "Tarefas atrasadas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Escolha uma cor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Lembre-me de todos os compromissos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "Lembretes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "s�b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:441
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Exibir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Exibir hora de t�rmino de compromissos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Exibir n�meros das semanas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "In�cio do dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:442
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domigo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
 msgstr "Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Tarefas com prazo para hoje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "qui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:439
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tempo at� o prazo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Tempo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Unidades de tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Fuso hor�rio: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "ter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:437
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Ter�a-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "qua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:438
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Semana �til"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutos antes que ocorram."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:76
-msgid "seconds."
-msgstr "segundos."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Voc� tem certeza que deseja excluir esta tarefa sem t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Voc� tem certeza que deseja excluir a tarefa `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Voc� tem certeza que deseja excluir o item de di�rio `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr "Ir para"
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Cumprida"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Cumprida"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Prazo de conclus�o"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editar compromisso"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Item de di�rio - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sem resumo"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Sobrescrever arquivo?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"J� existe um arquivo com este nome.\n"
+"Sobrescrev�-lo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Salvar como..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Voc� tem certeza que deseja excluir o comprimisso `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Voc� tem certeza que deseja excluir este comprimisso sem t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Voc� tem certeza que deseja excluir a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Voc� tem certeza que deseja excluir esta tarefa sem t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Voc� tem certeza que deseja excluir o item de di�rio `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Voc� tem certeza que deseja excluir este item de di�rio sem t�tulo?"
 
-#: calendar/gui/dialogs/save-comp.c:46
-msgid "Do you want to save changes?"
-msgstr "Voc� deseja salvar as modifica��es?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Voc� tem certeza que deseja excluir o comprimisso `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Cu_mprida:"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Voc� tem certeza que deseja excluir a tarefa `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-msgid "C_lassification:"
-msgstr "C_lassifica��o:"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Voc� tem certeza que deseja excluir o item de di�rio `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Cancelled"
-msgstr "Cancelada"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selecionar nome de:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Cumprida"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Se��es:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Cumprida em:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuso hor�rio: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Alta"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Lembrete"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Repeti��o"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "_Configura��es"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Dia _inteiro"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "Classifica��o"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data de envio"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
+msgstr "Pa_rticular"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
+msgstr "P�_blico"
+
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
+msgstr "R_esumo:"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Hora de _t�rmino:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora de _in�cio:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grupo %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Fonte"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Carro"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Pessoas _necess�rias"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Excluir a��o"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Recebida"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Preliminar"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
 msgstr "Em progresso"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Baixa"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#. add a "None" option to the stores menu
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: mail/mail-account-editor.c:674 mail/mail-account-editor.c:676
-#: mail/mail-account-editor.c:725 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:872 mail/mail-config.glade.h:42
-#: shell/e-shell-view.c:1116 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhum"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Normal"
-msgstr "Normal"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Not Started"
-msgstr "N�o iniciada"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "S_ummary"
-msgstr "_Resumo"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Sta_rt Date:"
-msgstr "Data de _in�cio:"
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Enviar como:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Excluir..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Todos os participantes"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Data cumprida"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Gerente"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Dezembro"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Celular"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 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 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Empresa:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Convidar outros..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Este compromisso possui repeti��es que o Evolution n�o pode editar."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dia"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "�"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ocorr�ncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Repeti��o personalizada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "A cada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Exce��es"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sem repeti��o"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Visualizar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regra de repeti��o"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Repeti��o simples"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "por"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "para sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "m�s(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "at�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Voc� deseja salvar as modifica��es?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Cumprida em:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Selecionar nome de:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nenhum"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Indefinido"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tarefa"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Contacts..."
-msgstr "Co_ntatos..."
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Cu_mprida:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-page.glade.h:14
+#, fuzzy
+msgid "Progress"
+msgstr "Em progresso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de _in�cio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "Prazo de _conclus�o:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:692
-msgid "Edit Task"
-msgstr "Editar tarefa"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:698 calendar/gui/event-editor.c:338
-msgid "No summary"
-msgstr "Sem resumo"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:344
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
+msgid "30%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:347
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:350
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Item de di�rio - %s"
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Abrir"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Recor_tar"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "C_olar"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcar como cumprida"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "Excluir esta tarefa"
+
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcar como cumprida"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Exclui a tarefa"
+
+#: calendar/gui/e-calendar-table.c:1137
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Clique aqui para o cat�logo de endere�os"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Cu_mprida:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorias"
 
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Classification"
-msgstr "Classifica��o"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Cumprida"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data cumprida"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Prazo de conclus�o"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data de t�rmino"
 
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Data de in�cio"
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Posi��o geogr�fica"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Porcentagem cumprida"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data de in�cio"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Transparency"
 msgstr "Transpar�ncia"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Abrir..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Abre a tarefa"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Marcar como cumprida"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Marca a tarefa como cumprida"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "Exclui a tarefa"
-
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i fra��es de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-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:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 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:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Novo compromisso..."
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Editar este compromisso..."
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Dia _inteiro"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#: ui/evolution-event-editor.xml.h:15
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Ir para hoje"
+
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Ir para data"
+
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Excluir este compromisso"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Tornar este compromisso m�vel"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Excluir esta ocorr�ncia"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Excluir todas as ocorr�ncias"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Todos"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Categoria:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "N�o foi poss�vel carregar as tarefas em `%s'"
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "O m�todo necess�rio para carregar `%s' n�o � suportado"
-
-#. 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/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Dia _inteiro"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "B�sico do compromisso"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "Repeti��o personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "Dias"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "A cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "Exce��es"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "Horas"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "Co_rreio para:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Sem repeti��o"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "Visualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pa_rticular"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "P�_blico"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "E_ste � o endere�o de correspond�ncia"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "Repeti��o"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Regra de repeti��o"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "Lembrete"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "Repeti��o simples"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "R_esumo:"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Este arquivo existe mas n�o � leg�vel."
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tempo"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Audio"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Confidencial"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "Co_ntatos"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_Exibi��o"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _t�rmino:"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_Correio"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Programa"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "E_xecutar programa:"
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "A pasta aparenta estar corrompida de modo irrecuper�vel."
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "Hora de _in�cio:"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "Data de _in�cio:"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dia(s)"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "por"
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A %d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "para sempre"
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Agenda"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "m�s(es)"
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Data"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "at�"
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Carregando agenda"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "semana(s)"
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Carregando agenda"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "ano(s)"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Salvar mensagem como..."
 
-#: calendar/gui/event-editor.c:332
-msgid "Edit Appointment"
-msgstr "Editar compromisso"
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
 
-#: calendar/gui/event-editor.c:410
-msgid "on"
-msgstr "no"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
 
-#: calendar/gui/event-editor.c:435 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dia"
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr "Todos"
 
-#: calendar/gui/event-editor.c:562
-msgid "on the"
-msgstr "no"
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr "Categoria:"
 
-#: calendar/gui/event-editor.c:569
-msgid "th"
-msgstr "�"
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "N�o foi poss�vel carregar as tarefas em `%s'"
 
-#: calendar/gui/event-editor.c:723
-msgid "occurrences"
-msgstr "ocorr�ncias"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "O m�todo necess�rio para carregar `%s' n�o � suportado"
 
-#: calendar/gui/event-editor.c:840
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Este compromisso possui repeti��es que o Evolution n�o pode editar."
+#. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Novo compromisso..."
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/gnome-cal.c:999
 #, 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:707
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo necess�rio para abrir `%s' n�o � suportado"
@@ -3099,399 +3682,814 @@ msgid "Go To Date"
 msgstr "Ir para data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir para hoje"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Janeiro"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Julho"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Junho"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mar�o"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Maio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Novembro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Outubro"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "N�o foi poss�vel iniciar Gnome"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir para hoje"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1�"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2�"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3�"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4�"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5�"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6�"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7�"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8�"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9�"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10�"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11�"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12�"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13�"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14�"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15�"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16�"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17�"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18�"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19�"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20�"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21�"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22�"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23�"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24�"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29�"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30�"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31�"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "do"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "se"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "te"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "qu"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "qu"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "se"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "s�"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia atual (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana atual (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "M�s atual (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano atual (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1035
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Visualizar impress�o"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprime este item"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Configurar impress�o..."
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "A URI da pasta de tarefas a ser exibida"
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/tasks-migrate.c:106
+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
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, 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
+#, 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
 msgid "SMTWTFS"
 msgstr "DSTQQSS"
 
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#: camel/camel-cipher-context.c:171
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "O tipo especificado n�o � suportado neste reposit�rio"
+
+#: camel/camel-cipher-context.c:211
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "O tipo especificado n�o � suportado neste reposit�rio"
+
+#: camel/camel-cipher-context.c:251
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "O tipo especificado n�o � suportado neste reposit�rio"
+
+#: camel/camel-cipher-context.c:294
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "O tipo especificado n�o � suportado neste reposit�rio"
+
+#: camel/camel-cipher-context.c:336
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "O tipo especificado n�o � suportado neste reposit�rio"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Sincronizando pasta"
+
+#: camel/camel-filter-driver.c:644
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "N�o � poss�vel abrir o cat�logo de endere�os"
+
+#: camel/camel-filter-driver.c:653
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr ""
+"N�o � poss�vel registrar a pasta '%s':\n"
+"%s"
+
+#: camel/camel-filter-driver.c:667
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Recuperando mensagem %s"
+
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "Mensagem encaminhada - %s"
+
+#: camel/camel-filter-driver.c:672
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"N�o � poss�vel obter mensagem: %s\n"
+"  %s"
+
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Sincronizando pasta"
+
+#: camel/camel-filter-driver.c:766
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Salvando mensagem %d de %d (uid \"%s\")"
+
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Salvando mensagem %d de %d (uid \"%s\")"
+
+#: camel/camel-filter-driver.c:892
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Erro ao salvar arquivo: %s"
+
+#: camel/camel-filter-driver.c:898
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro ao executar busca por filtro: %s: %s"
+
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
 
+#: camel/camel-folder-search.c:328
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na express�o regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:338
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na express�o regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:559
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "N�o foi poss�vel criar pipe: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+"N�o � poss�vel abrir local `%s':\n"
+"%s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "N�o foi poss�vel executar fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "N�o foi poss�vel criar arquivo de bloqueio para %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Tempo esgotado ao tentar obter arquivo de bloqueio em %s. Tente novamente "
 "mais tarde."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Falha ao obter bloqueio usando fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Falha ao obter bloqueio usando flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "N�o foi poss�vel verificar arquivo de correio %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "N�o foi poss�vel abrir arquivo de correio %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "N�o foi poss�vel abrir arquivo de correio tempor�rio %s: %s"
 
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "N�o foi poss�vel testar arquivo de bloqueio para %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro ao ler arquivo de correio: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro ao escrever arquivo de correio tempor�rio: %s"
-
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Falha ao armazenar correio no arquivo tempor�rio %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "N�o foi poss�vel criar pipe: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "N�o foi poss�vel executar fork: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Falha no programa Movemail: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erro desconhecido)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro ao ler arquivo de correio: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro ao escrever arquivo de correio tempor�rio: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Erro ao escrever arquivo de correio tempor�rio: %s"
+
+#: camel/camel-pgp-context.c:193
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Por favor, entre a sua frase-senha de %s para %s"
+
+#: camel/camel-pgp-context.c:196
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Por favor, entre a sua frase-senha de %s"
+
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr "N�o foi fornecida uma senha."
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "N�o foi poss�vel criar pipe para GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "N�o foi poss�vel criar arquivo tempor�rio: %s"
+
+#: camel/camel-pgp-context.c:1063
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Clique no �cone para decifrar."
+
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
+msgstr "Sem destinat�rios especificados"
+
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "N�o foi poss�vel carregar %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "N�o foi poss�vel carregar %s: Sem c�digo de inicializa��o no m�dulo."
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servi�o para %s em %s"
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Conex�o cancelada"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "N�o foi poss�vel conectar � %s (porta %d): %s."
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(m�quina desconhecida)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Opera��o cancelada"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:489
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "O servidor rejeitou o nome do usu�rio"
+
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr "Esta op��o conectar� ao servidor IMAP usando uma senha em texto claro."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autentica��o"
+
+#: camel/camel-sasl-anonymous.c:119
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:131
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Erro ao carregar infora��o do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:143
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Erro ao carregar infora��o do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:35
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:37
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr "Esta op��o conectar� ao servidor SMTP usando autentica��o CRAM-MD5."
+
+#: camel/camel-sasl-digest-md5.c:43
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:45
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr "Esta op��o conectar� ao servidor IMAP usando uma senha em texto claro."
+
+#: camel/camel-sasl-digest-md5.c:810
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:819
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:825
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:847
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
+
+#: camel/camel-sasl-digest-md5.c:865
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:875
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Resposta do servidor terminou cedo demais."
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:42
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "Esta op��o conectar� ao servidor IMAP usando autentica��o Kerberos 4."
+
+#: camel/camel-sasl-kerberos4.c:161
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"N�o foi poss�vel obter ticket do Kerberos:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
+msgid "Bad authentication response from server."
+msgstr "Resposta de autentica��o inv�lida do servidor."
+
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#, fuzzy
+msgid "This option will connect to the server using a simple password."
+msgstr "Esta op��o conectar� ao servidor IMAP usando uma senha em texto claro."
+
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "N�o � necess�ria autentica��o"
+
+#: camel/camel-search-private.c:111
+#, fuzzy, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Falha ao escrever para o mbox tempor�rio: %s: %s"
+
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "A URL '%s' precisa de um componente nome do usu�rio"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente m�quina"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:548
 #, c-format
-msgid "No such host %s."
-msgstr "N�o existe a m�quina %s."
+msgid "Resolving: %s"
+msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:575
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "N�o � poss�vel temporariamente procurar nome de m�quina %s."
+msgid "Failure in name lookup: %s"
+msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-service.c:600
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
+msgid "Virtual folder email provider"
+msgstr "Provedor de correio em pastas virtuais"
+
+#: camel/camel-session.c:70
+msgid "For reading mail as a query of another set of folders"
+msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
+
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "N�o existe provedor dispon�vel para o protocolo `%s'"
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3500,99 +4498,237 @@ msgstr ""
 "N�o foi poss�vel criar diret�rio %s:\n"
 "%s"
 
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "A URL `%s' n�o possui um protocolo"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Por favor, entre a sua frase-senha de %s para %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Este arquivo n�o existe."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Este arquivo n�o existe."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Falha ao enviar nome do usu�rio ao servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Anexar um arquivo � mensagem"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "A URL `%s' cont�m um protocolo inv�lido"
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
 
-#: camel/camel-url.c:150
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "N�mero de porta na URL `%s' n�o � n�merico"
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"N�o foi poss�vel obter ticket do Kerberos:\n"
+
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"N�o foi poss�vel abrir arquivo `%s':\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Resposta de autentica��o inv�lida do servidor."
+#: camel/camel-vee-folder.c:452
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "N�o existe tal mensagem: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/camel-vee-folder.c:547
+#, c-format
+msgid "No such message: %s"
+msgstr "N�o existe tal mensagem: %s"
+
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"Voc� pode apenas editar mensagens salvas\n"
+"na pasta Drafts."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "N�o foi poss�vel criar o diret�rio %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "N�o foi poss�vel carregar resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Salvando modifica��es � mensagem..."
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
+#, fuzzy
+msgid "This message is not currently available"
+msgstr ""
+"Esta mensagem n�o possui um assunto.\n"
+"Enviar mesmo assim?"
+
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Salvando mensagens"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "N�o foi poss�vel localizar corpo da mensagem na resposta FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "N�o foi poss�vel criar o diret�rio %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Criar um novo correio eletr�nico"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Copiar mensagem para uma nova pasta"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+msgid "Folders"
+msgstr "Pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "Assinar a pasta \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+#, fuzzy
+msgid "Namespace"
+msgstr "Espa�o de nomes:"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta op��o conectar� ao servidor IMAP usando uma senha em texto claro."
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:463
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+"N�o � poss�vel conectar ao servidor POP.\n"
+"N�o existe suporte para o mecanismo de autentica��o pedido."
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "Esta op��o conectar� ao servidor IMAP usando autentica��o Kerberos 4."
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "N�o � necess�ria autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3603,97 +4739,109 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "N�o foi poss�vel criar o diret�rio %s: %s"
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "N�o existe a pasta `%s'."
+
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Diret�rios de correio no formato MH"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Para armazenar correio local em diret�rios de correio do tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Arquivo mbox padr�o do Unix"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Para armazenar correio local no formato padr�o mbox"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Arquivos de correio no formato qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Para armazenar correio local em diret�rios no formato qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Arquivos de correio no formato qmail maildir"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Para armazenar correio local em diret�rios no formato qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Raiz de armazenagem %s n�o � um caminho absoluto"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Raiz de armazenagem %s n�o � um diret�rio comum"
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "N�o � poss�vel obter pasta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
+#: camel/providers/local/camel-local-store.c:173
+#, fuzzy
+msgid "Local stores do not have an inbox"
 msgstr "Reposit�rios locais n�o possuem uma pasta raiz"
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Reposit�rios locais n�o possuem uma pasta padr�o"
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Pastas locais n�o podem ser aninhadas."
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "N�o foi poss�vel renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "N�o foi poss�vel excluir arquivo de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "N�o foi poss�vel excluir arquivo de �ndice de pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "N�o � poss�vel acrescentar mensagem � pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3702,19 +4850,20 @@ msgstr ""
 "N�o � poss�vel obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "N�o existe tal mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Conte�do de mensagem inv�lido"
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3723,15 +4872,15 @@ msgstr ""
 "N�o foi poss�vel abrir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Pasta `%s' n�o existe."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3740,35 +4889,58 @@ msgstr ""
 "N�o foi poss�vel criar pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' n�o � um diret�rio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "N�o foi poss�vel excluir a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "n�o � um diret�rio maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"N�o foi poss�vel criar pasta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "N�o � poss�vel abrir mbox: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "N�o � poss�vel obter pasta: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "N�o � poss�vel abrir mbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "N�o � poss�vel acrescentar mensagem ao arquivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3777,15 +4949,17 @@ msgstr ""
 "N�o � poss�vel obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuper�vel."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3794,7 +4968,7 @@ msgstr ""
 "N�o foi poss�vel abrir arquivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3803,14 +4977,14 @@ msgstr ""
 "N�o foi poss�vel criar arquivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' n�o � um arquivo comum."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3819,175 +4993,300 @@ msgstr ""
 "N�o foi poss�vel excluir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' n�o est� vazia. Ela n�o foi exclu�da."
 
-#: camel/providers/local/camel-mbox-summary.c:240
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Sincronizando pasta"
+
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "N�o foi poss�vel abrir pasta: %s: resumindo da posi��o %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:274
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Erro fatal do analisador de correio pr�ximo � posi��o %ld na pasta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:349
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "N�o � poss�vel resumir a pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
+msgid "Synchronising folder"
+msgstr "Sincronizando pasta"
+
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "N�o foi poss�vel abrir pasta para resumir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "N�o � poss�vel abrir mbox tempor�rio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
+#: 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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e a pasta n�o coincidem, mesmo ap�s uma sincroniza��o"
 
-#: camel/providers/local/camel-mbox-summary.c:571
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escrever para o mbox tempor�rio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Falha ao escrever para o mbox tempor�rio: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "N�o foi poss�vel fechar pasta fonte %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "N�o foi poss�vel fechar pasta tempor�ria: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "N�o foi poss�vel renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:836
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "N�o � poss�vel acrescentar mensagem a pasta MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' n�o � um diret�rio."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "N�o � poss�vel abrir mbox: %s: %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "N�o � poss�vel acrescentar mensagem ao arquivo mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' n�o � um arquivo comum."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Pasta `%s' n�o existe."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Reposit�rios locais n�o possuem uma pasta raiz"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Arquivo de correio local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Pastas locais n�o podem ser aninhadas."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Pastas locais n�o podem ser aninhadas."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "N�o foi poss�vel abrir arquivo de correio tempor�rio %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "N�o foi poss�vel fechar pasta fonte %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Por favor entre a senha NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "O servidor rejeitou o nome do usu�rio"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Falha ao enviar nome do usu�rio ao servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Servidor rejeitou nome do usu�rio/senha"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensagem %s n�o encontrada."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "N�o foi poss�vel obter a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "N�o � poss�vel carregar o arquivo de lista de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "N�o � poss�vel salvar o arquivo de lista de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "Not�cias USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Este � um provedor para ler e publicar em grupos de not�cias da USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "N�o foi poss�vel abrir diret�rio para servidor de not�cias: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta op��o autenticar� com o servidor NNTP usando uma senha em texto claro."
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "N�o � poss�vel abrir ou criar o arquivo .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:149
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Recuperando mensagens"
+
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "N�o foi poss�vel conectar ao servidor POP em %s."
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "N�o foi poss�vel abrir pasta: a listagem das mensagens estava incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "N�o existe mensagem com uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:296
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recuperando mensagem %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "N�o foi poss�vel enviar a mensagem: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "N�o foi poss�vel recuperar mensagem do servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Cabe�alho da mensagem"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Manter correio no servidor"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Exclui a tarefa"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -3996,7 +5295,7 @@ msgstr ""
 "recuperar correio a partir de certos provedores de correio web e sistemas de "
 "correio propriet�rios."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: 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."
@@ -4004,7 +5303,7 @@ msgstr ""
 "Esta op��o conectar� ao servidor POP usando uma senha em texto claro. Esta � "
 "a �nica op��o suportada por v�rios servidores POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: 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 "
@@ -4014,28 +5313,33 @@ msgstr ""
 "protocolo APOP. Isto pode n�o funcionar para todos os usu�rios mesmo em "
 "servidores que alegam suportar o protocolo."
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: 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 ""
 "Esta op��o conectar� ao servidor POP usando Kerberos 4 para autentica��o."
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "N�o foi poss�vel autenticar o servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "N�o foi poss�vel conectar ao servidor POP em %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "N�o foi poss�vel conectar ao servidor POP em %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPor favor entre a senha POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4044,12 +5348,12 @@ msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar nome do usu�rio: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4057,7 +5361,7 @@ msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "N�o existe suporte para o mecanismo de autentica��o pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4066,17 +5370,17 @@ msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�o existe a pasta `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:59
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4084,378 +5388,428 @@ msgstr ""
 "Para entregar correio passando-o para o programa \"sendmail\" no sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "N�o foi poss�vel criar pipe para o sendmail: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "N�o foi poss�vel executar fork para o sendmail: %s: a mensagem n�o foi "
 "enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "N�o foi poss�vel enviar a mensagem: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail terminou com sinal %s: a mensagem n�o foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "N�o foi poss�vel executar %s: a mensagem n�o foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail terminou com estado %d: a mensagem n�o foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "N�o foi poss�vel localizar corpo da mensagem na resposta FETCH."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:54
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para entregar correio conectando � um servidor remoto usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando n�o reconhecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos par�metros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando n�o implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Par�metro de comando n�o implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Estado do sistema ou resposta de ajuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensagem de ajuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servi�o pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servi�o fechando canal de transmiss�o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servi�o indispon�vel, fechando canal de transmiss�o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "A��o de correio pedida OK, terminada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usu�rio n�o � local; irei encaminhar para <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "A��o de correio pedida n�o executada: caixa postal indispon�vel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A��o pedida n�o executada: caixa postal indispon�vel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "A��o pedida abortada: erro no processamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "O usu�rio n�o � local; por favor tente <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "A��o pedida n�o executada: espa�o no sistema insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "A��o de correio pedida abortada: espa�o alocado excedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "A��o pedida n�o executada: nome da caixa postal n�o permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inicie entrada da mensagem; termine com <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "A transa��o falhou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:212
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "N�o foi fornecida uma senha."
+
+#: camel/providers/smtp/camel-smtp-transport.c:214
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:216
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"N�o � poss�vel conectar ao servidor POP.\n"
+"N�o existe suporte para o mecanismo de autentica��o pedido."
+
+#: camel/providers/smtp/camel-smtp-transport.c:218
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "N�o � necess�ria autentica��o"
+
+#: camel/providers/smtp/camel-smtp-transport.c:220
+#, fuzzy
+msgid "Authentication required"
+msgstr "N�o � necess�ria autentica��o"
+
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de boas-vindas: %s: possivelmente n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "N�o � necess�ria autentica��o"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
-"Esta op��o conectar� ao servidor SMTP sem usar qualquer tipo de "
-"autentica��o. Isto deve ser adequado para conectar � maioria dos servidores "
-"SMTP."
+"N�o � poss�vel conectar ao servidor POP.\n"
+"N�o existe suporte para o mecanismo de autentica��o pedido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:10
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:397
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, fuzzy, c-format
 msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "Esta op��o conectar� ao servidor SMTP usando autentica��o CRAM-MD5."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"N�o � poss�vel autenticar com o servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "N�o � poss�vel enviar mensagem: endere�o do remetente n�o foi definido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "N�o � poss�vel enviar mensagem: endere�o do remetente n�o � v�lido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando mensagem"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "N�o � poss�vel enviar mensagem: n�o foram definido destinat�rios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido HELO: %s: n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta de HELO: %s: n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentica��o"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Tempo excedido no pedido RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Resposta de autentica��o inv�lida do servidor."
+
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido MAIL FROM: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erro na resposta de MAIL FROM: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido RCPT TO: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erro na resposta de RCPT TO: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta de DATA: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tempo excedido no envio de DATA: termina��o de mensagem: %s: a mensagem n�o "
 "foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Erro na resposta de DATA: termina��o de mensagem: %s: a mensagem n�o foi "
 "enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido QUIT: %s: n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta de QUIT: %s: n�o-fatal"
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Provedor de correio em pastas virtuais"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
-
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:154
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Anexar um arquivo"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Remover"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Incluir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo � mensagem"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1109
-msgid "Attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propriedades do anexo"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome do arquivo:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Anexo embutido"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Clique aqui para o cat�logo de endere�os"
 
-#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:353
-#: mail/mail-format.c:626
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:297
-msgid "Click here for the address book"
-msgstr "Clique aqui para o cat�logo de endere�os"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Responder-a:"
 
-#: composer/e-msg-composer-hdrs.c:354
-msgid "Enter the identity you wish to send this message from"
-msgstr "Entre a identidade com a qual voc� deseja enviar esta mensagem"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinat�rios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:363 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endere�os que receber�o uma c�pia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4463,55 +5817,102 @@ msgstr ""
 "Entre os endere�os que receber�o uma c�pia da mensagem sem aparecer na lista "
 "de destinat�rios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:634
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: composer/e-msg-composer-hdrs.c:377
-msgid "Enter the subject of the mail"
-msgstr "Entre o assunto da correspond�ncia"
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"N�o foi poss�vel abrir arquivo de assinatura %s:\n"
+"N�o foi poss�vel abrir arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Erro ao preparar para %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Trabalhando"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Salvando modifica��es � mensagem..."
+#: composer/e-msg-composer.c:997
+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:720
-msgid "Save changes to message..."
-msgstr "Salvar modifica��es � mensagem..."
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Erro ao salvar mensagem para 'Drafts': %s"
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "N�o foi poss�vel recuperar mensagem do servidor POP %s: %s"
 
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"N�o � poss�vel criar arquivo de sa�da: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"N�o � poss�vel criar arquivo de sa�da: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erro ao salvar mensagens para: %s:\n"
+" %s"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4521,111 +5922,173 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Este arquivo n�o existe."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Este n�o � um arquivo comum."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Este arquivo existe mas n�o � leg�vel."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Este arquivo aparenta ser acess�vel mas open(2) falhou."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"O arquivo � muito grande (mais que 100K).\n"
-"Voc� tem certeza que deseja inser�-lo?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Um erro ocorreu ao ler o arquivo."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "FIXME: Inserir arquivo"
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "N�o foi poss�vel criar janela de reda��o."
 
-#: composer/evolution-composer.c:360
+#: composer/evolution-composer.c:359
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "N�o � poss�vel iniciar o redator do Evolution."
 
-#: filter/filter-datespec.c:62
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Su�te do grupo Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Endere�o _2:"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Informa��o do usu�rio"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, 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:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "m�s"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dias"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Voc� esqueceu de escolher uma data."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Voc� escolheu uma data inv�lida."
 
-#: filter/filter-datespec.c:259
+#: 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"
@@ -4635,7 +6098,7 @@ msgstr ""
 "ao instante quando o filtro � executado ou\n"
 "a pasta virtual � aberta."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4643,7 +6106,7 @@ msgstr ""
 "A data da mensagem ser� comparada em rela��o\n"
 "ao instante que voc� especificou aqui."
 
-#: filter/filter-datespec.c:322
+#: 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"
@@ -4654,67 +6117,53 @@ msgstr ""
 "\"uma semana atr�s\", por exemplo."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "o instante atual"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "um instante especificado"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "um instante relativo ao instante atual"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar em rela��o a"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<clique aqui para selecionar uma data>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Incluir regra de filtro"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar regra de filtro"
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
 
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "de entrada"
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
 
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "de sa�da"
+#: filter/filter-datespec.c:709
+msgid "<click here to select a date>"
+msgstr "<clique aqui para selecionar uma data>"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar filtros"
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Regras de filtro"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Ent�o"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Incluir a��o"
 
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Excluir a��o"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4722,19 +6171,20 @@ msgstr ""
 "Oops, voc� esqueceu de escolher uma pasta.\n"
 "Por favor volte e especifique uma pasta v�lida para onde entregar correio."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Entre URI da pasta"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4743,64 +6193,65 @@ msgstr ""
 "Erro na express�o regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Teste"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sem t�tulo"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executar a��es"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se todos os crit�rios forem atendidos"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se algum crit�rio for atendido"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Adicionar crit�rio"
 
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Remover crit�rio"
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr "de entrada"
 
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr "Em resposta a"
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr "de sa�da"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr "Importante"
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Incluir"
 
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr "Lida"
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar filtros"
 
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Editar pastas virtuais"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Regras de filtro"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "De entrada"
@@ -4809,323 +6260,547 @@ msgstr "De entrada"
 msgid "Outgoing"
 msgstr "De sa�da"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Pastas virtuais"
 
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "A pasta especificada n�o foi achada"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "Fontes de pastas virtuais"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Atribuir cor"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Registrar pasta local"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Atribuir pontua��o"
+#, fuzzy
+msgid "Assign Color"
+msgstr "Atribuir cor"
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar para pasta"
+msgid "Assign Score"
+msgstr "Atribuir pontua��o"
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recebimento"
+#, fuzzy
+msgid "Attachments"
+msgstr "Anexo"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data de envio"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "cont�m"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Express�o"
+msgid "Copy to Folder"
+msgstr "Copiar para pasta"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Encaminhar para endere�o"
+msgid "Date received"
+msgstr "Data de recebimento"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da mensagem"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Cabe�alho da mensagem"
+msgid "Date sent"
+msgstr "Data de envio"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Mensagem foi recebida"
+#, fuzzy
+msgid "Deleted"
+msgstr "Excluir"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Mensagem foi enviada"
+msgid "does not contain"
+msgstr "n�o cont�m"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para pasta"
+msgid "does not end with"
+msgstr "n�o termina com"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinat�rios"
+msgid "does not exist"
+msgstr "n�o existe"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "Correspond�ncia com express�o regular"
+msgid "does not sound like"
+msgstr "n�o soa como"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Pontua��o"
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "n�o come�a com"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remetente"
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "n�o existe"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Atribuir estado"
+#, fuzzy
+msgid "Draft"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Fonte"
+msgid "ends with"
+msgstr "termina com"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Cabe�alho espec�fico"
+#, fuzzy
+msgid "Exist"
+msgstr "Sair"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr "Estado"
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Parar o processamento"
+msgid "Expression"
+msgstr "Express�o"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assunto"
+#: filter/libfilter-i18n.h:24
+msgid "Important"
+msgstr "Importante"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "ap�s"
+msgid "is"
+msgstr "�"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "antes"
+msgid "is greater than"
+msgstr "� maior que"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "cont�m"
+msgid "is less than"
+msgstr "� menor que"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "n�o cont�m"
+msgid "is not"
+msgstr "n�o �"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "n�o termina com"
+#, fuzzy
+msgid "Mailing list"
+msgstr "Lista de discuss�o %s"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "n�o existe"
+msgid "Message Body"
+msgstr "Corpo da mensagem"
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "n�o soa como"
+msgid "Message Header"
+msgstr "Cabe�alho da mensagem"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "n�o come�a com"
+msgid "Message was received"
+msgstr "Mensagem foi recebida"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina com"
+msgid "Message was sent"
+msgstr "Mensagem foi enviada"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "Move to Folder"
+msgstr "Mover para pasta"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "� maior que"
+msgid "on or after"
+msgstr "em ou ap�s"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "� menor que"
+msgid "on or before"
+msgstr "em ou antes"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "n�o �"
+msgid "Read"
+msgstr "Lida"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "�"
+msgid "Recipients"
+msgstr "Destinat�rios"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "em ou ap�s"
+msgid "Regex Match"
+msgstr "Correspond�ncia com express�o regular"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "em ou antes"
+msgid "Replied to"
+msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
+msgstr "Pontua��o"
+
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
+msgstr "Remetente"
+
+#: filter/libfilter-i18n.h:43
+msgid "Set Status"
+msgstr "Atribuir estado"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamanho"
+
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "Conta"
+
+#: filter/libfilter-i18n.h:47
+msgid "Specific header"
+msgstr "Cabe�alho espec�fico"
+
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "come�a com"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:50
+msgid "Stop Processing"
+msgstr "Parar o processamento"
+
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Assunto"
+
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi ap�s"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "foi antes"
 
-#: filter/score-editor.c:127
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Adicionar regra"
+
+#: filter/rule-editor.c:240
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
 msgstr "Editar regra de pontua��o"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Adicionar regra de pasta virtual"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "Editar regra de pontua��o"
 
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Editar regra de pasta virtual"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: mail/component-factory.c:294
-msgid "Cannot initialize Evolution's mail component."
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+#, fuzzy
+msgid "Import"
+msgstr "Importante"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "Correio"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "E-mail"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Incluir cat�logo de endere�os"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_Configura��es"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: 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:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "E-mail principal"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
 msgstr "N�o � poss�vel iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr "N�o � poss�vel registrar reposit�rio com a shell."
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "N�o � poss�vel iniciar o componente Executive Summary do Evolution."
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Armazenar busca como pasta virtual"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "N�o � poss�vel iniciar o redator do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "N�o � poss�vel iniciar o componente de correio do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configura��o de correio"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propriedades..."
 
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Corpo ou assunto cont�m"
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modificar as propriedades do arquivo"
 
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Corpo cont�m"
+#: mail/component-factory.c:757
+msgid "Cannot initialize Evolution's mail component."
+msgstr "N�o � poss�vel iniciar o componente de correio do Evolution."
 
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Assunto cont�m"
+#: mail/component-factory.c:894
+msgid "Cannot register storage with shell"
+msgstr "N�o � poss�vel registrar reposit�rio com a shell."
 
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Corpo n�o cont�m"
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propriedades"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Assunto n�o cont�m"
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Propriedades"
 
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Remetente cont�m"
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
 
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:893
+msgid "Store search as vFolder"
+msgstr "Armazenar busca como pasta virtual"
+
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
 msgstr "Pasta virtual por assunto"
 
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Pasta virtual por remetente"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "Pasta virtual por _remetente"
+
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Pasta virtual por _destinat�rios"
 
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Pasta virtual por destinat�rios"
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
+msgstr "Filtro por lista de discuss�o"
 
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtro por assunto"
 
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtro por remetente"
 
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtro por destinat�rios"
 
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtro por lista de discuss�o"
 
-#: mail/folder-browser.c:669 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
+#: mail/folder-browser.c:1273
+#, fuzzy
+msgid "Resend"
+msgstr "segundo"
 
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Salvar como..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "Salvar _como..."
 
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "_Imprimir"
+
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "Responder ao remetente"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Responder a todos"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Encaminhar"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Encaminhar embutido"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Mar_k as Read"
 msgstr "Marcar como lida"
 
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#, fuzzy
+msgid "Mark as U_nread"
 msgstr "Marcar como n�o lida"
 
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Mover para pasta..."
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
 
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Copiar para pasta..."
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como n�o lida"
 
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Desfazer exclus�o"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "_Mover para pasta..."
+
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copiar para pasta..."
+
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "Des_fazer exclus�o"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Incluir cat�logo de endere�os"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Criar regra a partir da mensagem"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtro por lista de discuss�o"
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtro por lista de discuss�o"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro por lista de discuss�o (%s)"
 
+#: mail/folder-browser.c:1483
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Filtro por lista de discuss�o (%s)"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato do reposit�rio corrente:"
@@ -5160,49 +6835,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (padr�o)"
+#: 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 ""
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Gerenciador de contas do Evolution"
-
-#: mail/mail-account-editor.c:265
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Um ou mais dos seus servidores n�o est�o configurados corretamente.\n"
-"Voc� deseja salvar de qualquer forma?"
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de contas do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:625
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Assinatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensagem n�o foi enviada.\n"
+"\n"
+"Voc� deseja salvar as suas modifica��es?"
+
+#: mail/mail-accounts.c:135
+msgid " (default)"
+msgstr " (padr�o)"
+
+#: mail/mail-accounts.c:174
+#, fuzzy
+msgid "Disable"
+msgstr "Desativado"
+
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:264
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "Voc� tem certeza que deseja excluir esta tarefa sem t�tulo?"
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Desfazer exclus�o"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Torne esta a minha conta padr�o"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "Voc� tem certeza que deseja excluir este comprimisso sem t�tulo?"
+
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
+msgstr "Gerenciador de contas do Evolution"
+
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto � %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discuss�o %s"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+msgid "Add Filter Rule"
+msgstr "Incluir regra de filtro"
+
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5214,7 +6940,7 @@ msgstr ""
 "receber ou redigir mensagens.\n"
 "Voc� desejaria configur�-lo agora?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5222,7 +6948,7 @@ msgstr ""
 "Voc� deve configurar uma identidade\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5230,11 +6956,11 @@ msgstr ""
 "Voc� deve configurar um transporte de correio\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Voc� n�o estabeleceu um m�todo de transporte de correio"
 
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5242,27 +6968,45 @@ msgstr ""
 "Esta mensagem n�o possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "Voc� deve configurar uma conta antes de poder enviar esta mensagem."
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:310
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Voc� deve especificar destinat�rios para poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:410
+msgid "You must configure an account before you can send this email."
+msgstr "Voc� deve configurar uma conta antes de poder enviar esta mensagem."
+
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
+msgstr "Em %s, %s escreveu:\n"
+
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensagem encaminhada:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Voc� tem certeza que deseja excluir a tarefa `%s'?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5270,27 +7014,34 @@ msgstr ""
 "Voc� pode apenas editar mensagens salvas\n"
 "na pasta Drafts."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:78
-msgid "Overwrite file?"
-msgstr "Sobrescrever arquivo?"
-
-#: mail/mail-callbacks.c:792 mail/mail-display.c:82
+#: mail/mail-callbacks.c:1430
+#, fuzzy
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"You may only resend messages\n"
+"in the Sent folder."
 msgstr ""
-"J� existe um arquivo com este nome.\n"
-"Sobrescrev�-lo?"
+"Voc� pode apenas editar mensagens salvas\n"
+"na pasta Drafts."
+
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Voc� tem certeza que deseja excluir a tarefa `%s'?"
 
-#: mail/mail-callbacks.c:836
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Mensagem foi recebida"
+
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:946
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5299,43 +7050,133 @@ msgstr ""
 "Erro ao carregar infora��o do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "Editar filtros"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:1042
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Falhou a impress�o da mensagem"
 
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Voc� tem certeza que deseja excluir esta tarefa sem t�tulo?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Assitente de contas do Evolution"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor"
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informa��o de conta"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Ger�ncia de conta"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Propriedades de conta"
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Accounts"
+msgstr "Conta"
 
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "Avan�ado"
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Authentication Type: "
 msgstr "Tipo de autentica��o:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:15
+msgid "Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redigir"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5351,191 +7192,297 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configura��es."
 
-#: mail/mail-config.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:18
-msgid "Default"
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "De_fault"
 msgstr "Padr�o"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:21
-msgid "E-Mail Address:"
-msgstr "Endere�o eletr�nico:"
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Drafts"
+msgstr "Dias"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Criando nova pasta"
+
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Endere�o eletr�nico:"
 
-#: mail/mail-config.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "Configura��o de correio do Evolution"
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Desativado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:28
-msgid "Hostname:"
-msgstr "Nome da m�quina:"
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Assinatura:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "IMAPv4 "
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "Servidor de correio de entrada"
-
-#: mail/mail-config.glade.h:31
-msgid "Keep mail on server"
-msgstr "Manter correio no servidor"
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
 
-#: mail/mail-config.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Visualizar embutido"
 
-#: mail/mail-config.glade.h:33
-msgid "Mail"
-msgstr "Correio"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Kerberos "
+msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:34
-msgid "Mail Account"
-msgstr "Conta de correio"
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configura��o de correio"
 
-#: mail/mail-config.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "Assitente de configura��o de correio"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato da caixa de correio"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Torne esta a minha conta padr�o"
 
-#: mail/mail-config.glade.h:38
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensagens como \"Lida\" ap�s:"
 
-#: mail/mail-config.glade.h:39
-msgid "Miscellaneous"
-msgstr "Diversos"
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Not�cias"
 
-#: mail/mail-config.glade.h:43
-msgid "Optional"
-msgstr "Opcional"
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Optional Information"
+msgstr "Sem informa��o"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Empresa:"
 
-#: mail/mail-config.glade.h:46
-msgid "Outgoing Mail Server"
-msgstr "Servidor de correio de sa�da"
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
 
-#: mail/mail-config.glade.h:47
-msgid "Password:"
-msgstr "Senha:"
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "PGP binary path:"
+msgstr "Cifrar com PGP"
 
-#: mail/mail-config.glade.h:49
-msgid "Plain Text"
-msgstr "Texto claro"
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Concatenando uma mensagem sem um assunto"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "N�o � poss�vel enviar mensagem: n�o foram definido destinat�rios."
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "maildir"
+
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Nota"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:51
-msgid "Remember my password"
-msgstr "Lembre a minha senha"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:52 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Responder-a:"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Receiving Options"
+msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:53
-msgid "Required"
-msgstr "Exigido"
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Save password"
-msgstr "Salvar senha"
+#: mail/mail-config.glade.h:81
+#, fuzzy
+msgid "Required Information"
+msgstr "Informa��o do usu�rio"
 
-#: mail/mail-config.glade.h:56
-msgid "Select signature file"
-msgstr "Selecionar arquivo de assinatura"
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Seguran�a"
+
+#: mail/mail-config.glade.h:85
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar mensagens em formato HTML como padr�o."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviando mensagem"
+
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#, fuzzy
+msgid "Sent"
+msgstr "Vista"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Enviar a mensagem agora"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "Enviar a mensagem mais tarde"
+
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configura��o do servidor"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo do servidor: "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Servidor requer autentica��o"
 
-#: mail/mail-config.glade.h:63
-msgid "Servers"
-msgstr "Servidores"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:65
-msgid "Signature:"
-msgstr "Assinatura:"
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Fonte"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Sem informa��o"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:67
-msgid "This server requires a secure connection (SSL)"
-msgstr "Este servidor requer uma conex�o segura (SSL)"
-
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo"
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Special Folders"
+msgstr "Pastas virtuais"
 
-#: mail/mail-config.glade.h:69
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Digite o nome com o qual deseja identificar estes servidores. Por exemplo: "
-"\"Trabalho\" ou \"Casa\"."
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "Standard Unix mbox"
+msgstr "Arquivo mbox padr�o do Unix"
 
-#: mail/mail-config.glade.h:71
-msgid "User Information"
-msgstr "Informa��o do usu�rio"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "Use secure connection (SSL)"
+msgstr "Este servidor requer uma conex�o segura (SSL)"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nome do usu�rio:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5545,171 +7492,246 @@ msgstr ""
 "\n"
 "Pressione \"Pr�ximo\" para come�ar. "
 
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
-"Falha ao verificar a configura��o de recebimento de correio.\n"
-"Voc� pode enfrentar problemas ao recuperar mensagens de %s"
-
-#: mail/mail-config-druid.c:458
-msgid "Namespace:"
-msgstr "Espa�o de nomes:"
 
-#: mail/mail-config-druid.c:643
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
-"Falha ao verificar a configura��o de envio de correio.\n"
-"Voc� pode enfrentar problemas ao enviar mensagens usando %s"
 
-#. set window title
-#: mail/mail-config-druid.c:992
-msgid "Evolution Account Wizard"
-msgstr "Assitente de contas do Evolution"
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segundos."
 
-#: mail/mail-display.c:97
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"N�o foi poss�vel abrir arquivo %s:\n"
-"%s"
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
 
-#: mail/mail-display.c:130
-#, c-format
-msgid "Could not write data: %s"
-msgstr "N�o foi poss�vel escrever dados: %s"
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
 
-#: mail/mail-display.c:228
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "N�o foi poss�vel criar caixa de di�logo."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:268
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
-
-#: mail/mail-display.c:310
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Salvar para o disco..."
 
-#: mail/mail-display.c:312
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir em %s..."
-
-#: mail/mail-display.c:314
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Visualizar embutido"
 
-#: mail/mail-display.c:341
-msgid "External Viewer"
-msgstr "Visualizador externo"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualizar embutido (via %s)"
 
-#: mail/mail-display.c:368
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-format.c:505
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizador externo"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Carregando conte�do da mensagem"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "_Abrir em uma nova janela"
+
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Copiar a sele��o"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "Salvar na _pasta... (FIXME)"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Salvar como..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, c-format
+msgid "%d unsent"
+msgstr ""
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:653
-msgid "Loading message content"
-msgstr "Carregando conte�do da mensagem"
+#: mail/mail-format.c:662
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"N�o foi poss�vel abrir pasta: a listagem das mensagens estava incompleta."
+
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Endere�o eletr�nico:"
 
-#: mail/mail-format.c:941
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder-a:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Para"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "Sem programa GPG/PGP dispon�vel."
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensagem cifrada n�o exibida"
 
-#: mail/mail-format.c:947
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensagem cifrada"
 
-#: mail/mail-format.c:948
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Clique no �cone para decifrar."
 
-#: mail/mail-format.c:1350
+#: mail/mail-format.c:1377
 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:1358
+#: mail/mail-format.c:1388
 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."
+msgstr ""
+"Esta mensagem est� assinada digitalmente mas n�o � poss�vel estabelecer sua "
+"autenticidade."
 
-#: mail/mail-format.c:1562
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:1574
+#: mail/mail-format.c:2060
 #, 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:1578
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:1612
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Apontador para site FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1617
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-format.c:1788
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Em %s, %s escreveu:\n"
+#: mail/mail-local.c:458
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Abrir em %s..."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Alterar pasta \"%s\" para o formato \"%s\""
-
-#: mail/mail-local.c:251
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando pasta"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "Fechando pasta atual"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr "Renomeando pasta antiga e abrindo"
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Criando nova pasta"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Copiando mensagens"
-
-#: mail/mail-local.c:348
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5718,7 +7740,7 @@ msgstr ""
 "N�o � poss�vel salvar metainfo da pasta; voc� provavelmente descobrir� que "
 "n�o pode mais abrir esta pasta: %s"
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5726,24 +7748,16 @@ msgstr ""
 "Se voc� n�o pode mais abrir esta caixa postal\n"
 "ent�o voc� precisar repar�-la manualmente."
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr "Registrando pasta local"
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr "Registrar pasta local"
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
 msgstr ""
-"N�o � poss�vel registrar a pasta '%s':\n"
-"%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurar %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5752,7 +7766,7 @@ msgstr ""
 "Erro enquanto '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:89
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5761,116 +7775,108 @@ msgstr ""
 "Erro ao executar opera��o:\n"
 "%s"
 
-#: mail/mail-mt.c:372 mail/mail-mt.c:401
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Trabalhando"
 
-#: mail/mail-ops.c:510
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:512
-msgid "Sending message"
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
 msgstr "Enviando mensagem"
 
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Concatenando \"%s\""
-
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
-msgid "Appending a message without a subject"
-msgstr "Concatenando uma mensagem sem um assunto"
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Salvando mensagem %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:833
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Movendo mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#, fuzzy
+msgid "Complete."
+msgstr "Cumprida"
 
-#: mail/mail-ops.c:835
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:805
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Mover a mensagem para uma nova pasta"
 
-#: mail/mail-ops.c:838
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mover mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-ops.c:840
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Copiando mensagens"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:874
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:894
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensagem %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:356
-msgid "(No description)"
-msgstr "(Sem descri��o)"
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Tarefa"
 
-#: mail/mail-ops.c:1100
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1210
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1272
-msgid "Synchronising folder"
-msgstr "Sincronizando pasta"
+#: mail/mail-ops.c:1297
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrindo pasta %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurando pasta"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1371
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1438
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recuperando mensagens"
 
-#: mail/mail-ops.c:1448
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recuperando mensagem n�mero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1596
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Carregando pasta %s para %s"
-
-#: mail/mail-ops.c:1598
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Carregar pasta %s para %s"
-
-#: mail/mail-ops.c:1764
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Salvando mensagens"
 
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5879,12 +7885,7 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1856
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvando mensagem %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5893,275 +7894,1684 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Mensagem incompleta escrita no pipe!"
+#: mail/mail-ops.c:1987
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Salvar anexo"
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:2003
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
-"Erro ao preparar para %s:\n"
-"%s"
+"N�o � poss�vel criar arquivo de sa�da: %s\n"
+" %s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:2032
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
+msgstr "N�o foi poss�vel escrever dados: %s"
+
+#: mail/mail-ops.c:2101
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "Conectando ao servidor"
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sem nome)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Imprimir mensagem"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Editar mensagem"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Enviando mensagem"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
-"Erro enquanto `%s':\n"
-"%s"
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Erro ao ler comandos da thread de envio."
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Buscar por uma express�o"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Mensagem corrompida da thread de envio?"
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Localizar"
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "N�o foi poss�vel criar caixa de di�logo."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Caminho:"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
+msgstr "Cancelada"
+
+#: mail/mail-send-recv.c:250
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "Recebendo mensagem"
+
+#: mail/mail-send-recv.c:253
+#, fuzzy
+msgid "Receiving"
+msgstr "Recebendo mensagem"
+
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
+msgstr ""
+
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
+msgstr ""
+
+#: mail/mail-send-recv.c:323
+#, fuzzy
+msgid "Sending"
+msgstr "Enviando \"%s\""
+
+#: mail/mail-send-recv.c:488
+#, fuzzy
+msgid "Cancelled."
+msgstr "Cancelada"
+
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
 msgstr "O usu�rio cancelou a consulta."
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "N�o foi poss�vel criar mbox tempor�rio `%s': %s"
 
-#: mail/mail-tools.c:250
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensagem encaminhada)"
-
-#: mail/mail-tools.c:260
-msgid "Fwd: (no subject)"
-msgstr "Enc: (sem assunto)"
-
-#: mail/mail-tools.c:277
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem encaminhada - %s"
 
-#: mail/mail-tools.c:279
-msgid "Forwarded message (no subject)"
-msgstr "Mensagem encaminhada (sem assunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensagens encaminhadas"
 
-#: mail/mail-tools.c:380
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"N�o � poss�vel abrir local `%s':\n"
-"%s"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensagens encaminhadas"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Responder ao remetente desta mensagem"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Responder a todos os destinat�rios desta mensagem"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Encaminhar esta mensagem"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Imprime a mensagem selecionada"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Exclui esta mensagem"
-
-#: mail/message-list.c:599
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "N�o vista"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
+#: mail/message-list.c:616
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "Esconder mensagens _exclu�das"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
+#: mail/message-list.c:617
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "_Mensagem de correio"
+
+#: mail/message-list.c:621
+#, fuzzy
+msgid "Lowest"
+msgstr "Baixa"
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr "<desconhecido>"
+#: mail/message-list.c:622
+#, fuzzy
+msgid "Lower"
+msgstr "Baixa"
+
+#: mail/message-list.c:626
+#, fuzzy
+msgid "Higher"
+msgstr "Alta"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Highest"
+msgstr "Alta"
+
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Salvando mensagens"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.c:1110
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1110
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1110
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recebida"
 
-#: mail/message-list.c:1111
-msgid "To"
-msgstr "Para"
-
-#: mail/message-list.c:1111
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor, entre a sua frase-senha de %s para %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor, entre a sua frase-senha de %s"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Sem programa GPG/PGP dispon�vel."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "N�o foi fornecida uma senha."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "N�o foi poss�vel criar pipe para GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Sem destinat�rios especificados"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "N�o foi poss�vel criar arquivo tempor�rio: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Pasta"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "Reposit�rio"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Exibir pastas come�ando com:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Obtendo reposit�rio para \"%s\""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Obter reposit�rio para \"%s\""
-
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
+#: mail/subscribe-dialog.c:273
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%s\""
 
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Assinar a pasta \"%s\""
+#. Construct the app
+#: mail/subscribe-dialog.c:878
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Gerenciar assinaturas..."
 
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Cancelar a assinatura da pasta \"%s\""
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "N�o � poss�vel iniciar o componente Executive Summary do Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "N�o � poss�vel iniciar o componente Executive Summary do Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Compromisso - %s"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Exibir compromissos"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%H:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %k:%M"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sem resumo"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Instala��o do Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erro ao carregar agenda</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Exibir tarefas"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Se��es:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e de %B de %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Falhou a impress�o da mensagem"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "N�o foi poss�vel iniciar Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Limpar"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Desativado"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Notas:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Colar"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "m�s"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Teste"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "_Notas:"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Exibir"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "R�dio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Localizar novamente"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "agora"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Correio"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Exibir todos"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "E-mail principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Recebendo mensagem"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erro desconhecido"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "�"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Retrato"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Fechar esta janela"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Pontua��o"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Exibir tarefas"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Fechar esta janela"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cabe�alho"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "Dias"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Respondida"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Pastas"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Todos os participantes"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Exibir pastas come�ando com:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Op��es de exibi��o"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Exibi��o"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Sexta-feira"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Quarta-feira"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "m�s"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Agendar reuni�o"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Exibir tarefas"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Exibir tarefas"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tarefas"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Limpar a sele��o"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "N�o � poss�vel iniciar o Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalhes"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Pastas virtuais"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instala��o do Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6169,28 +9579,25 @@ msgstr ""
 "Esta nova vers�o do Evolution precisa instalar arquivos adicionais\n"
 "no seu diret�rio pessoal do Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Por favor clique \"OK\" para instalar os arquivos ou \"Cancelar\" para sair."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "N�o foi poss�vel atualizar os arquivos corretamente"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Arquivos do Evolution instalados com sucesso."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:200
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Esta parece ser a primeira vez que voc� executa o Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Por favor clique \"OK\" para instalar os arquivos do Evolution em"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6201,16 +9608,14 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:224
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"N�o � poss�vel copiar arquivos em\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Um erro ocorreu ao ler o arquivo."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6221,7 +9626,16 @@ msgstr ""
 "Por favor o mova para permitir a instala��o\n"
 "dos arquivos de usu�rio do Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6232,7 +9646,58 @@ msgstr ""
 "do Evolution. Por favor, o mova para permitir\n"
 "a instala��o dos arquivos de usu�rio do Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "N�o � poss�vel obter pasta: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"N�o � poss�vel copiar arquivos em\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copiar para pasta"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mover para pasta"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Selecionar pasta"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Voc� tem certeza que deseja excluir a tarefa `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrindo pasta %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6241,15 +9706,15 @@ msgstr ""
 "N�o � poss�vel criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "O nome especificado para a pasta � inv�lido."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Criar nova pasta"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -6257,27 +9722,122 @@ msgstr ""
 "O tipo da pasta selecionada n�o � v�lido para\n"
 "a opera��o desejada."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Novo..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sem nome)"
 
-#: shell/e-shell-view-menu.c:127
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+#, fuzzy
+msgid "Importing"
+msgstr "Importante"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erro ao salvar arquivo: %s"
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Erro ao carregar arquivo: %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "_Autoescolher"
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "Nome do arquivo:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Selecionar arquivo de assinatura"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "Nome do arquivo:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Selecionar pasta"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n�o foi encontrado em seu $PATH."
 
-#: shell/e-shell-view-menu.c:133
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy n�o p�de ser executado."
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:187
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6287,34 +9847,72 @@ msgstr ""
 "para correio, agenda e gerenciamento de contatos\n"
 "dentro do ambiente GNOME."
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Criar um novo grupo de atalhos"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Trabalhando"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Trabalhando"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: shell/e-shell-view.c:471
-msgid "Folders"
-msgstr "Pastas"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shell-view.c:1121
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1123
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "N�o � poss�vel definir reposit�rio local -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6323,15 +9921,15 @@ msgstr ""
 "Ooops! A visualiza��o para `%s' terminou inesperadamente. :-(\n"
 "Isto provavelmente significa que o componente %s falhou."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6340,159 +9938,275 @@ msgstr ""
 "Voc� deseja realmente excluir o grupo\n"
 "`%s' da barra de atalhos?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "N�o remover"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "�cones _pequenos"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como �cones pequenos"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como �cones grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Excluir este grupo..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Excluir este grupo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Ativar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "_Abrir em uma nova janela"
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Ativa este atalho"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Erro ao salvar atalhos."
 
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "Visualizar a pasta selecionada"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Fontes"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
 
-#: shell/e-storage.c:160
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "Co_ntatos"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sem nome)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sem erro"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erro gen�rico"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "J� existe uma pasta com o mesmo nome"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "O tipo de pasta especificado n�o � v�lido"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "N�o h� espa�o suficiente para criar a pasta"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "A pasta especificada n�o foi achada"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Fun��o n�o implementada neste reposit�rio"
 
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "Permiss�o negada"
-
-#: shell/e-storage.c:429
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Opera��o n�o suportada"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado n�o � suportado neste reposit�rio"
 
-#: shell/main.c:74
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Cu_mprida:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Qualquer campo cont�m"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "M�quina:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome do arquivo:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Pasta"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "N�o h� espa�o suficiente para criar a pasta"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Editor de contas do Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Editor de contas do Evolution"
+
+#: shell/importer/import.glade.h:6
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
 msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importante"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "N�o remover"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, no-c-format
+msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"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"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\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 eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6500,175 +10214,337 @@ msgstr ""
 "Obrigado\n"
 "The Evolution Team\n"
 
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "N�o � poss�vel iniciar o Evolution."
 
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Desativar."
+#: shell/main.c:215
+msgid "Disable splash screen"
+msgstr ""
+
+#: shell/main.c:216
+msgid "Send the debugging output of all components to a file."
+msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "N�o � poss�vel iniciar o sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copiar a sele��o"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Criar novo contato"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Apagar um contato"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Criar novo contato"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Localizar um contato"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Recortar"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Recortar a sele��o"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Apagar um contato"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Novo contato"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Not�cias"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Colar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Colar a �rea de transfer�ncia"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Visualiza a impress�o da mensagem a ser impressa"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimir contatos"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Selecionar todos"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Apagar um contato"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Parar a carga"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Visualizar todos"
+#: ui/evolution-addressbook.xml.h:22
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Fontes de cat�logos de endere�os"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Visualizar todos os contatos"
+#: ui/evolution-addressbook.xml.h:23
+#, fuzzy
+msgid "_Contact"
+msgstr "Co_ntatos"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "Configura��o do cat�logo de _endere�os..."
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "Co_ntatos"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Imprimir contatos..."
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+msgid "_Print..."
+msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Busca por contatos"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dias"
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "Selecionar todos"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "A_genda"
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "Prefer�ncias da agenda..."
+#, fuzzy
+msgid "Create a New All-Day _Event"
+msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Criar uma nova agenda"
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dia"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Go To"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Voltar no tempo"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Avan�ar no tempo"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "Ir para"
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Ir para data"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir para uma data espec�fica"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir para o presente"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "M�s"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "New appointment"
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "New Appointment"
 msgstr "Novo compromisso"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "Abrir uma agenda"
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Visualiza a impress�o da mensagem a ser impressa"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "Ant"
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Print calendar"
+msgstr "Imprimir agenda"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print this Calendar"
 msgstr "Imprimir esta agenda"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Salvar agenda como outra coisa"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Informa��o do usu�rio"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Exibe 1 dia"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Exibe 1 m�s"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Exibe 1 semana"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Exibe a semana �til"
 
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Semana �til"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
+msgstr "Novo compromisso..."
+
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Prefer�ncias da agenda..."
+
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Month"
+msgstr "M�s"
+
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Novo"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Fechar"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_Abrir agenda"
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Fechar este compromisso"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "_Imprimir esta agenda"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Excluir este compromisso"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra de tarefas principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Visualiza a impress�o da mensagem a ser impressa"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Visualizar impress�o"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configurar impress�o..."
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprime este item"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Salvar e fechar"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Salva o compromisso e fecha a caixa de di�logo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Mudar a visualiza��o para %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar a p�gina para a sua impressora atual"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_A��es"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Arquivo"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Exclui este item"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Excluir..."
 
@@ -6680,6 +10556,12 @@ msgstr "Ajuda"
 msgid "Print En_velope..."
 msgstr "Imprimir en_velope..."
 
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save _As..."
+msgstr "Salvar _como..."
+
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Salva o contato e fecha a caixa de di�logo"
@@ -6688,641 +10570,2500 @@ msgstr "Salva o contato e fecha a caixa de di�logo"
 msgid "Se_nd contact to other..."
 msgstr "E_nviar o contato a outro..."
 
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr "Ver ajuda on-line"
+
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Enviar _mensagem ao contato..."
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Imprimir..."
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "Fechar este compromisso"
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+msgid "_Save"
+msgstr "_Salvar"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Encaminar como vCa_lendar"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Exclui este item"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Novo compromisso"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Salva a tarefa e fecha a caixa de di�logo"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar o contato a outro..."
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva o compromisso e fecha a caixa de di�logo"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar _mensagem ao contato..."
 
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
 msgstr "Agendar reuni�o"
 
-#: ui/evolution-event-editor.xml.h:89
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "FIXME: Encaminar como vCa_lendar"
+
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Encaminhar esta mensagem"
+
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "Atualizar lista"
+
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "Agendar _reuni�o"
 
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "Agendar algum tipo de reuni�o"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Agendar reuni�o"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+#, fuzzy
+msgid "_Actions"
+msgstr "_A��es"
+
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
+
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Salvar o arquivo atual"
+
+#: ui/evolution-mail-global.xml.h:3
 msgid "Compose"
 msgstr "Redigir"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
 msgstr "Redigir uma nova mensagem"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Copiar mensagem para uma nova pasta"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Criar regra"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Pasta"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filtro por _remetente"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtro por _destinat�rios"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Esquecer _senhas"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Pegar correio"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Gerenciar assinaturas..."
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Recebida"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar mensagens na fila de sa�da e recuperar novas mensagens"
+
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Editor de pastas _virtuais..."
+
+#: ui/evolution-mail-global.xml.h:19
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtros de correio..."
+
+#: ui/evolution-mail-global.xml.h:20
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Mensagem de correio"
+
+#: ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_Configura��es"
+
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Visualizar"
+
+#: ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Recebida"
+
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Esconder mensagens _selecionadas"
+
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide S_elected Messages"
 msgstr "Esconder mensagens _selecionadas"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Deleted Messages"
 msgstr "Esconder mensagens _exclu�das"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Esconder mensagens _lidas"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtros de correio..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Gerenciar assinaturas..."
+#: ui/evolution-mail-list.xml.h:10
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Marcar como lida"
+
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Marcar mensagens como \"Lida\" ap�s:"
+
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Colar a �rea de transfer�ncia"
+
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Selecionar _todos"
+
+#: ui/evolution-mail-list.xml.h:16
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Selecionar _todos"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Marcar como _lida"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Marcar como _n�o lida"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Exclui esta mensagem"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Show _All"
+msgstr "Exibir todos"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Lista de mensagens encadeadas"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Excluir permanentemente"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Pasta"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter sele��o"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propriedades..."
+
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Lista de mensagens encadeadas"
+
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responder a todos os destinat�rios desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder ao remetente desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copiar mensagem para uma nova pasta"
+
+#: ui/evolution-mail-message.xml.h:7
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Criar regra a partir da mensagem"
+
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder ao remetente desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Exclui esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Exclui esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "Filtro por lista de discuss�o"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "Filtro por remetente"
+
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
+msgstr "Filtro por destinat�rios"
+
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
+msgstr "Filtro por assunto"
+
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Encaminhar"
+
+#: ui/evolution-mail-message.xml.h:30
+#, fuzzy
+msgid "Forward As"
+msgstr "Encaminhar"
+
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Encaminhar embutido"
+
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Encaminhar"
+
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mensagens encaminhadas"
+
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Importante"
+
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Marcar como n�o lida"
+
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "Mover a mensagem para uma nova pasta"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Pr�ximo"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Responder ao remetente desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "_Mensagem"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Selecionar _todos"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Imprimir mensagem"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Visualiza a impress�o da mensagem a ser impressa"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Visualizar impress�o da mensagem..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
+
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Imprime a mensagem na impressora"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir mensagem"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
 msgstr "Imprimir mensagem..."
 
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Responder a _todos"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Visualizar impress�o"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Responder ao _remetente"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "_Fonte"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Selecionar _todos"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Responder a todos"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar mensagens na fila de sa�da e recuperar novas mensagens"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "_Mensagem"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
 msgstr "Exibir _todas as mensagens"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Lista de mensagens encadeadas"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "N�o existe mensagem com uid %s"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Anexar um arquivo � mensagem"
+
+#: ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Filtro por lista de discuss�o"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "Pasta virtual por _remetente"
 
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "Pasta virtual por _destinat�rios"
 
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Ver o c�digo fonte da mensagem"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Pasta virtual por assunto"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar filtros"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configurar pasta..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Copiar para pasta..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Editar mensagem"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copiar para pasta"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Excluir permanentemente"
+#: ui/evolution-mail-message.xml.h:86
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Criar regra a partir da mensagem"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtro por assunto"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Mensagens encaminhadas"
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Encaminhar"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "_Exibi��o"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter sele��o"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Mover para pasta"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_Configura��o de correio..."
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "_Exibi��o"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
 msgstr "_Mensagem"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Mover para pasta..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Abrir em uma nova janela"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "_Editar mensagem"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Imprimir mensagem"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Fechar esta janela"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Salvar mensagem como..."
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Personalizar barras de ferramentas"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Encadeado"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizar"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "Des_fazer exclus�o"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizar barras de ferramentas"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Pasta virtual por assunto"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Fechar"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor de pastas _virtuais..."
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Visualizar"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
 
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+msgid "Close the current file"
+msgstr "Fechar o arquivo atual"
+
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Selecionar arquivo de assinatura"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensagem com PGP"
 
 #: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserir arquivo texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserir um arquivo como texto na mensagem"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserir arquivo texto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir um arquivo"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Cifrar com PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Cifrar com PGP"
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Salvar"
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Salvar como"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Salvar _rascunho"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salvar na _pasta... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Salvar na pasta..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Salvar o arquivo atual"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar mais _tarde"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar mais _tarde"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar as mensagens em formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar a mensagem mais tarde"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar a mensagem agora"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar esta mensagem agora"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Exibir / esconder anexos"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Exibir _anexos"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Exibir anexos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Assinar esta mensagem com a sua chave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Alternar a exibi��o da barra de pastas"
+
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Alternar a exibi��o da barra de pastas"
+
 #: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir arquivo texto... (FIXME)"
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Alternar a exibi��o da barra de pastas"
 
 #: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Incluir anexo..."
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Depurar"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Excluir"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:53
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Responder-a:"
+
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Seguran�a"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Aj_uda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Adicionar pasta em sua lista de pastas assinadas"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "_Pasta"
+
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Atualizar lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Atualizar lista de pastas"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Remover pasta de sua lista de pastas assinadas"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Cancelar a assinatura"
 
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Cancelar"
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Exclui a tarefa"
+
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Atualizar lista"
+
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Copiar a sele��o"
+
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Exclui a tarefa"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Exclui a tarefa"
+
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "New Task"
+msgstr "FIXME: _Nova tarefa"
+
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Colar a �rea de transfer�ncia"
+
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
+msgstr "Salvar tarefa como outra coisa"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Configura��es"
+
+#: ui/evolution-tasks.xml.h:19
+#, fuzzy
+msgid "_Task"
+msgstr "Tarefa"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Sobre o Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Personalizar..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Es_conder a barra de atalhos"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Mudar a visualiza��o para %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de ferramentas"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copiar para pasta"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Criando nova pasta"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Remove este atalho da barra de atalhos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Criando nova pasta"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Exclui este item"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Exibir uma pasta diferente"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _atalhos do Evolution"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Sair"
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Primeiros passos"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importar um formato de arquivo externo"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de tarefas principal"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mover %s para a esquerda"
 
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Exibir informa��o sobre o Evolution"
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "_Abrir em uma nova janela"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Exibir a barra de _pastas"
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Exibir a barra de _atalhos"
+#: ui/evolution.xml.h:26
+msgid "Show information about Evolution"
+msgstr "Exibir informa��o sobre o Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Enviar relat�rio de erro"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Enviar relat�rio de _erro"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar relat�rio de erro usando o Bug Buddy."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibi��o da barra de pastas"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibi��o da barra de atalhos"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Usando o gerenciador de _contatos"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Usando a _agenda"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Usando o _correio"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Visualizar a pasta selecionada"
+
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Sobre o Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Compromisso (FIXME)"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Contato (FIXME)"
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importar arquivo..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indexar"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mensagem de correio"
 
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_Configura��es"
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mover"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
+
+#: ui/evolution.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nova pasta virtual"
+
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Substituir..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "Es_conder a barra de atalhos"
+
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Trabalhando"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Sobre o Evolution"
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Endere�o _2:"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Empresa"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipos de telefone"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Remetente"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "Estado"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Assunto"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Mensagem"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Categoria:"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Preliminar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora do escrit�rio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Sem informa��o"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Convidar outros..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Op��es"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Exibir com _menos amplia��o"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autoescolher"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Todas as pessoas e recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Pessoas _necess�rias"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Pessoas necess�rias e _um recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Hora de _in�cio da reuni�o:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Hora de _t�rmino da reuni�o:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Todos os participantes"
 
+#: widgets/menus/gal-view-menus.c:218
+#, fuzzy
+msgid "_Current View"
+msgstr "o instante atual"
+
+#: widgets/menus/gal-view-menus.c:259
+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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
+msgstr "Agora"
+
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoje"
+
+#: widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:731
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+"A data deve ser fornecida no formato: \n"
+"\n"
+"%s"
+
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Opcional"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Novo"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erro desconhecido: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Outro"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contatos"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#: widgets/misc/e-filter-bar.c:173
+#, fuzzy
+msgid "Save Search"
+msgstr "Buscar"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: widgets/misc/e-filter-bar.c:241
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Avan�ado"
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Exibir todos"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avan�ado..."
+
+#: widgets/misc/e-messagebox.c:152
+#, fuzzy
+msgid "Information"
+msgstr "Sem informa��o"
+
+#: widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Trabalhando"
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erro"
 
-#: widgets/misc/e-search-bar.c:176
+#: widgets/misc/e-messagebox.c:173
+#, fuzzy
+msgid "Question"
+msgstr "Descri��o"
+
+#: widgets/misc/e-messagebox.c:180
+#, fuzzy
+msgid "Message"
+msgstr "_Mensagem"
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Enviar esta mensagem agora"
+
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_Buscar"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#, fuzzy
+msgid "The Personal Addressbook Server"
+msgstr "Fontes de cat�logos de endere�os"
 
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "Su�te do grupo Evolution"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
+#, fuzzy
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "N�o foi poss�vel iniciar Gnome"
+
+#: wombat/wombat.c:185
+#, fuzzy
+msgid "init_corba(): could not initialize GNOME"
+msgstr "N�o foi poss�vel iniciar Gnome"
+
+#: wombat/wombat.c:198
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "N�o foi poss�vel iniciar Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Mudar prefer�ncias"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Prefer�ncias da tarefa..."
+
+#~ msgid "Add Service"
+#~ msgstr "Adicionar servi�o"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Adicionar um novo servi�o ao Executive Summary"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Configura��es do Executive Summary..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nova mensagem"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Voc� pode selecionar uma p�gina HTML diferente para o fundo do Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Apenas deixe-o vazio para o padr�o"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s com o aplicativo Gnome padr�o"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s com o navegador web Gnome padr�o"
+
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Fechar %s"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a direita"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s para a linha anterior"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s para a pr�xima linha"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "N�o � poss�vel abrir o arquivo HTML:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Arquivo n�o possui um lugar para os servi�os.\n"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O componente Executive Summary n�o pode iniciar o Bonobo.\n"
+#~ "Se ocorreu uma mensagem de alerta sobre o RootPOA, isto provavelmente\n"
+#~ "significa voc� compilou Bonobo com GOAD no lugar de OAF."
+
+#~ msgid "Connect to server"
+#~ msgstr "Conectar ao servidor"
+
+#~ msgid "About this application"
+#~ msgstr "Sobre este aplicativo"
+
+#~ msgid "About..."
+#~ msgstr "Sobre..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Dump XML"
+#~ msgstr "Descarregar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Descarregar a descri��o de IU XML"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: _Cat�logo de endere�os..."
+
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "FIXME: Atri_buir tarefa"
+
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: Escolher _formul�rio..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: _Verificar nomes"
+
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: _Copiar para pasta..."
+
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: _Projetar um formul�rio..."
+
+#~ msgid "FIXME: Define Print _Styles"
+#~ msgstr "FIXME: Definir estilos de _impress�o"
+
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Pro_jetar este formul�rio"
+
+#~ msgid "FIXME: Fi_rst Item in Folder"
+#~ msgstr "FIXME: P_rimeiro item na pasta"
+
+#~ msgid "FIXME: For_ward"
+#~ msgstr "FIXME: E_ncaminhar"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Ajuda"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Tarefa imcom_pleta"
+
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: It_em..."
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "FIXME: _Pedido de reuni�o"
+
+#~ msgid "FIXME: Paste _Special... "
+#~ msgstr "FIXME: Colar e_special..."
+
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Visuali_zar impress�o"
+
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: Pu_blicar formul�rio como..."
+
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: Publicar _formul�rio..."
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: _Repeti��o..."
+
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "FIXME: Responder a _todos"
+
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: En_viar"
+
+#~ msgid "FIXME: S_end Status Report"
+#~ msgstr "FIXME: En_viar relat�rio de estado"
+
+#~ msgid "FIXME: S_kip Occurrence"
+#~ msgstr "FIXME: Pu_lar ocorr�ncia"
+
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Salvar ane_xo..."
+
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: _Depurador de scripts"
+
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "FIXME: _Pedido de tarefa"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Compromisso"
+
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _Contato"
+
+#~ msgid "FIXME: _Customize..."
+#~ msgstr "FIXME: _Personalizar..."
+
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _Arquivo..."
+
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Fonte..."
+
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "FIXME: _Formata��o"
+
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Item"
+
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: Item de _di�rio"
+
+#~ msgid "FIXME: _Last Item in Folder"
+#~ msgstr "FIXME: �l_timo item na pasta"
+
+#~ msgid "FIXME: _Mail Message"
+#~ msgstr "FIXME: _Mensagem de correio"
+
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "FIXME: _Marcar como cumprida"
+
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "FIXME: Estilo de _memorando"
+
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "FIXME: _Mover para pasta..."
+
+#~ msgid "FIXME: _Object..."
+#~ msgstr "FIXME: _Objeto..."
+
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: _Par�grafo..."
+
+#~ msgid "FIXME: _Reply"
+#~ msgstr "FIXME: _Responder"
+
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Ortografia..."
+
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: _Padr�o"
+
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Tarefa"
+
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: Item _n�o lido"
+
+#~ msgid "FIXME: _note"
+#~ msgstr "FIXME: _nota"
+
+#~ msgid "Find _Again"
+#~ msgstr "Localizar _novamente"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Vai para o pr�ximo item"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Vai para o item anterior"
+
+#~ msgid "N_ext"
+#~ msgstr "P_r�ximo"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Configurar i_mpress�o..."
+
+#~ msgid "Redo"
+#~ msgstr "Refazer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refazer a a��o desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "Substituir"
+
+#~ msgid "Replace a string"
+#~ msgstr "Substituir uma express�o"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente pela mesma espress�o"
+
+#~ msgid "Select everything"
+#~ msgstr "Selecionar tudo"
+
+#~ msgid "Undo"
+#~ msgstr "Desfazer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfazer a �ltima a��o"
+
+#~ msgid "_About..."
+#~ msgstr "_Sobre..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Localizar..."
+
+#~ msgid "_Forms"
+#~ msgstr "_Formul�rios"
+
+#~ msgid "_Object"
+#~ msgstr "_Objeto"
+
+#~ msgid "_Redo"
+#~ msgstr "_Refazer"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Barras de ferramentas"
+
+#~ msgid "_Undo"
+#~ msgstr "_Desfazer"
+
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar a partir do pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar para o pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mesclar a partir do pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mesclar para o pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "A��o ao sincronizar"
+
+#~ msgid "Conduit state"
+#~ msgstr "Estado do canal"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Nenhum pilot configurado, por favor visite primeiramente\n"
+#~ "o painel Pilot Link na central de controle."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "N�o conectado ao daemon Gnome Pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Ocorreu um erro ao tentar ler a lista de\n"
+#~ "pilots a partir do daemon Gnome Pilot"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "Co_ntatos..."
+
+#~ msgid "_Company:"
+#~ msgstr "E_mpresa:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Srta.\n"
+#~ "Senhorita\n"
+#~ "Dr.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Como _minicart�es"
+
+#~ msgid "As _Table"
+#~ msgstr "Como _tabela"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "N�o foi poss�vel abrir este cat�logo de endere�os. Isto \n"
+#~ "significa que voc� forneceu uma URI incorreta ou tentou\n"
+#~ "acessar um servidor LDAP sem que o suporte para LDAP esteja\n"
+#~ "compilado. Se voc� entrou uma URI, verifique a URI e tente \n"
+#~ "novamente. Caso contr�rio, voc� provavelmente tentou\n"
+#~ "acessar um servidor LDAP. Se voc� quiser usar LDAP, voc�\n"
+#~ "vai precisar baixar e instalar OpenLDAP e recompilar e\n"
+#~ "instalar Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Localizar..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Canal para tarefas do Evolution"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Utilit�rio de configura��o do canal para tarefas do Evolution.\n"
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir agenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Salvar agenda"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "A prioridade deve estar entre 1 e 9, inclusive"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro ao carregar agenda:<br>M�todo n�o suportado"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmes param ap�s"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Permitir adiamento por"
+
+#~ msgid "Highlight"
+#~ msgstr "Real�ar"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Tarefas com prazo para hoje"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Tarefas com prazo ainda n�o vencido"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Tarefas com prazo ainda n�o vencido"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Tarefas atrasadas"
+
+#~ msgid "TaskPad"
+#~ msgstr "Tarefas"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo at� o prazo"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuais"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassifica��o:"
+
+#~ msgid "S_ummary"
+#~ msgstr "_Resumo"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editar tarefa"
+
+#~ msgid "Precent complete"
+#~ msgstr "Porcentagem cumprida"
+
+#~ msgid "Open..."
+#~ msgstr "Abrir..."
+
+#~ msgid "Open the task"
+#~ msgstr "Abre a tarefa"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marca a tarefa como cumprida"
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Editar este compromisso..."
+
+#~ msgid "Appointment Basics"
+#~ msgstr "B�sico do compromisso"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Co_rreio para:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
+
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
+
+#~ msgid "_Mail"
+#~ msgstr "_Correio"
+
+#~ msgid "_Program"
+#~ msgstr "_Programa"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data de _in�cio:"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "N�o foi poss�vel testar arquivo de bloqueio para %s: %s"
+
+#~ msgid "No such host %s."
+#~ msgstr "N�o existe a m�quina %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "N�o � poss�vel temporariamente procurar nome de m�quina %s."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "A URL `%s' n�o possui um protocolo"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "A URL `%s' cont�m um protocolo inv�lido"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "N�mero de porta na URL `%s' n�o � n�merico"
+
+#~ msgid "Local stores do not have a default folder"
+#~ msgstr "Reposit�rios locais n�o possuem uma pasta padr�o"
+
+#~ msgid ""
+#~ "This option will connect to the SMTP server without using any kind of "
+#~ "authentication. This should be fine for connecting to most SMTP servers."
+#~ msgstr ""
+#~ "Esta op��o conectar� ao servidor SMTP sem usar qualquer tipo de "
+#~ "autentica��o. Isto deve ser adequado para conectar � maioria dos servidores "
+#~ "SMTP."
+
+#~ msgid "Inline attachment"
+#~ msgstr "Anexo embutido"
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Entre a identidade com a qual voc� deseja enviar esta mensagem"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Entre o assunto da correspond�ncia"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "N�o foi poss�vel abrir arquivo de assinatura %s:\n"
+#~ "%s"
+
+#~ msgid "Save changes to message..."
+#~ msgstr "Salvar modifica��es � mensagem..."
+
+#~ msgid "Error saving composition to 'Drafts': %s"
+#~ msgstr "Erro ao salvar mensagem para 'Drafts': %s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Este n�o � um arquivo comum."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Este arquivo aparenta ser acess�vel mas open(2) falhou."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O arquivo � muito grande (mais que 100K).\n"
+#~ "Voc� tem certeza que deseja inser�-lo?"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Editar regra de filtro"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Remover crit�rio"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Encaminhar para endere�o"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Adicionar regra de pasta virtual"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Editar regra de pasta virtual"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Corpo ou assunto cont�m"
+
+#~ msgid "Body contains"
+#~ msgstr "Corpo cont�m"
+
+#~ msgid "Subject contains"
+#~ msgstr "Assunto cont�m"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Corpo n�o cont�m"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Assunto n�o cont�m"
+
+#~ msgid "Sender contains"
+#~ msgstr "Remetente cont�m"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Pasta virtual por remetente"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Pasta virtual por destinat�rios"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Mover para pasta..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copiar para pasta..."
+
+#~ msgid ""
+#~ "One or more of your servers are not configured correctly.\n"
+#~ "Do you wish to save anyway?"
+#~ msgstr ""
+#~ "Um ou mais dos seus servidores n�o est�o configurados corretamente.\n"
+#~ "Voc� deseja salvar de qualquer forma?"
+
+#~ msgid "Account Properties"
+#~ msgstr "Propriedades de conta"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configura��o de correio do Evolution"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Servidor de correio de entrada"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail Account"
+#~ msgstr "Conta de correio"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Assitente de configura��o de correio"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversos"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Servidor de correio de sa�da"
+
+#~ msgid "Plain Text"
+#~ msgstr "Texto claro"
+
+#~ msgid "Remember my password"
+#~ msgstr "Lembre a minha senha"
+
+#~ msgid "Required"
+#~ msgstr "Exigido"
+
+#~ msgid "Save password"
+#~ msgstr "Salvar senha"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Digite o nome com o qual deseja identificar estes servidores. Por exemplo: "
+#~ "\"Trabalho\" ou \"Casa\"."
+
+#~ msgid ""
+#~ "Failed to verify the incoming mail configuration.\n"
+#~ "You may experience problems retrieving your mail from %s"
+#~ msgstr ""
+#~ "Falha ao verificar a configura��o de recebimento de correio.\n"
+#~ "Voc� pode enfrentar problemas ao recuperar mensagens de %s"
+
+#~ msgid ""
+#~ "Failed to verify the outgoing mail configuration.\n"
+#~ "You may experience problems sending your mail using %s"
+#~ msgstr ""
+#~ "Falha ao verificar a configura��o de envio de correio.\n"
+#~ "Voc� pode enfrentar problemas ao enviar mensagens usando %s"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Alterar pasta \"%s\" para o formato \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Fechando pasta atual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando pasta antiga e abrindo"
+
+#~ msgid "Registering local folder"
+#~ msgstr "Registrando pasta local"
+
+#~ msgid "Appending \"%s\""
+#~ msgstr "Concatenando \"%s\""
+
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "Movendo mensagens de \"%s\" para \"%s\""
+
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "Copiando mensagens de \"%s\" para \"%s\""
+
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Mover mensagens de \"%s\" para \"%s\""
+
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Copiar mensagens de \"%s\" para \"%s\""
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s mensagem %d de %d (uid \"%s\")"
+
+#~ msgid "(No description)"
+#~ msgstr "(Sem descri��o)"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recuperando mensagem n�mero %d de %d (uid \"%s\")"
+
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "Carregando pasta %s para %s"
+
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Carregar pasta %s para %s"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Mensagem incompleta escrita no pipe!"
+
+#~ msgid ""
+#~ "Error while `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro enquanto `%s':\n"
+#~ "%s"
+
+#~ msgid "Error reading commands from dispatching thread."
+#~ msgstr "Erro ao ler comandos da thread de envio."
+
+#~ msgid "Corrupted message from dispatching thread?"
+#~ msgstr "Mensagem corrompida da thread de envio?"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensagem encaminhada)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Enc: (sem assunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensagem encaminhada (sem assunto)"
+
+#~ msgid "[ %s ]"
+#~ msgstr "[ %s ]"
+
+#~ msgid "%s, et al."
+#~ msgstr "%s, et al."
+
+#~ msgid "<unknown>"
+#~ msgstr "<desconhecido>"
+
+#~ msgid "Get store for \"%s\""
+#~ msgstr "Obter reposit�rio para \"%s\""
+
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "Cancelar a assinatura da pasta \"%s\""
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Arquivos do Evolution instalados com sucesso."
+
+#~ msgid "Activate"
+#~ msgstr "Ativar"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Ativa este atalho"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Evolution groupware suite.\n"
+#~ "\n"
+#~ "Over the time since the past release, our focus has been on making\n"
+#~ "Evolution usable.  Many of the Evolution developers are now using\n"
+#~ "Evolution to read their mail full time. You could too. (Just\n"
+#~ "be sure to keep a backup.)\n"
+#~ "\n"
+#~ "But while we have fixed many bugs affecting its stability and\n"
+#~ "security, you still get the disclaimer:  Evolution will: crash,\n"
+#~ "lose your mail when you don't want it to, refuse to delete your\n"
+#~ "mail when you do want it to, leave stray processes running,\n"
+#~ "consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+#~ "lists, and embarass you in front of your friends and co-workers.\n"
+#~ "Use only as directed.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we eagerly\n"
+#~ "await your contributions!\n"
+#~ msgstr ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Evolution groupware suite.\n"
+#~ "\n"
+#~ "Over the time since the past release, our focus has been on making\n"
+#~ "Evolution usable.  Many of the Evolution developers are now using\n"
+#~ "Evolution to read their mail full time. You could too. (Just\n"
+#~ "be sure to keep a backup.)\n"
+#~ "\n"
+#~ "But while we have fixed many bugs affecting its stability and\n"
+#~ "security, you still get the disclaimer:  Evolution will: crash,\n"
+#~ "lose your mail when you don't want it to, refuse to delete your\n"
+#~ "mail when you do want it to, leave stray processes running,\n"
+#~ "consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+#~ "lists, and embarass you in front of your friends and co-workers.\n"
+#~ "Use only as directed.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we eagerly\n"
+#~ "await your contributions!\n"
+
+#~ msgid "Disable."
+#~ msgstr "Desativar."
+
+#~ msgid "Find a contact"
+#~ msgstr "Localizar um contato"
+
+#~ msgid "View All"
+#~ msgstr "Visualizar todos"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualizar todos os contatos"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configura��o do cat�logo de _endere�os..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimir contatos..."
+
+#~ msgid "5 Days"
+#~ msgstr "5 dias"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "A_genda"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Criar uma nova agenda"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir uma agenda"
+
+#~ msgid "Prev"
+#~ msgstr "Ant"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Salvar agenda como outra coisa"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir agenda"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimir esta agenda"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Novo compromisso"
+
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Nota"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Agendar algum tipo de reuni�o"
+
+#~ msgid "Create Rule"
+#~ msgstr "Criar regra"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filtro por _remetente"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtro por _destinat�rios"
+
+#~ msgid "Get Mail"
+#~ msgstr "Pegar correio"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Marcar como _lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _n�o lida"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Visualizar impress�o da mensagem..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprime a mensagem na impressora"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Responder ao _remetente"
+
+#~ msgid "S_ource"
+#~ msgstr "_Fonte"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver o c�digo fonte da mensagem"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Configurar pasta..."
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtro por assunto"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Configura��o de correio..."
+
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimir mensagem"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Salvar mensagem como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Encadeado"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_Pasta virtual por assunto"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir arquivo texto... (FIXME)"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "_Personalizar..."
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _atalhos do Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Exibir a barra de _pastas"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Exibir a barra de _atalhos"
diff --git a/po/ro.po b/po/ro.po
index 91a6c2a505..9f69ca8229 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,19 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10\n"
-"POT-Creation-Date: 2001-04-26 10:52-0400\n"
-"POT-Creation-Date: 2001-06-26 10:52-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Configurarea importului fi�ierelor GnomeCard in Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Import fi�ierele GnomeCard �n Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Card: "
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +35,7 @@ msgstr ""
 "\n"
 "Nume: "
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +43,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +51,7 @@ msgstr ""
 "\n"
 "  Dat:        "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +59,7 @@ msgstr ""
 "\n"
 "  Suplimentar:  "
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +67,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +75,7 @@ msgstr ""
 "\n"
 "  Sufix:      "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +83,7 @@ msgstr ""
 "\n"
 "Data na�terii:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +91,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +99,7 @@ msgstr ""
 "\n"
 "  C�su�a po�tal�:"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +107,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +115,7 @@ msgstr ""
 "\n"
 "  Strada:      "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +123,7 @@ msgstr ""
 "\n"
 "  Ora�:        "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +131,7 @@ msgstr ""
 "\n"
 "  Regiunea:    "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +139,7 @@ msgstr ""
 "\n"
 "  Cod po�tal:  "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +147,7 @@ msgstr ""
 "\n"
 "  �ara:        "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +155,7 @@ msgstr ""
 "\n"
 "Eticheta de livrare:"
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +163,7 @@ msgstr ""
 "\n"
 "Telefoane:\n"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +171,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +179,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +187,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,25 +195,25 @@ msgstr ""
 "\n"
 "Program de mail:"
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -212,7 +221,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -220,7 +229,7 @@ msgstr ""
 "\n"
 "  Nume:  "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -228,7 +237,7 @@ msgstr ""
 "\n"
 "  Unitate:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -236,7 +245,7 @@ msgstr ""
 "\n"
 "  Unitate2:"
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -244,7 +253,7 @@ msgstr ""
 "\n"
 "  Unitate3:"
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -252,7 +261,7 @@ msgstr ""
 "\n"
 "  Unitate4"
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -260,7 +269,7 @@ msgstr ""
 "\n"
 "Categorii:  "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -278,7 +287,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -286,7 +295,7 @@ msgstr ""
 "\n"
 "�ir unic:      "
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -294,23 +303,25 @@ msgstr ""
 "\n"
 "Cheia public�:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Configurarea importului fi�ierelor GnomeCard in Evolution"
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Mesaje multiple"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Import fi�ierele GnomeCard �n Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Introduce�i parola pentru %s"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:40
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot ini�ializa Bonobo"
 
@@ -322,743 +333,862 @@ msgstr "Nu pot �nc�rca cursorul\n"
 msgid "EBook not loaded\n"
 msgstr "EBook ne�nc�rcat\n"
 
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nu pot porni serverul wombat"
 
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nu pot porni wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Control Bonobo pentru o adres� popup."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Control Bonobo pentru afi�area unei adrese."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Control Bonobo de prob� care afi�eaz� o agend�."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control care afi�eaz� o agend� minicard pentru Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Vizualizare agend� minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Component� Evolution pentru manipulare contacte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Configurare pentru controlul agendei minicard"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Configurare pentru afi�orul agendei de adrese"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Configurare pentru componentele agendei Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fi�ier"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tip de agend� necunoscut"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "F�r� (mod anonim)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Parola"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tip de autorizare necunoscut"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Baza"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Unu"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Subarbore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Memorez aceast� parol�"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Gazd�:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Text ajutor gazd�"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN r�d�cin�"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Text ajutor DN r�d�cin�"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Text ajutor port"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Scop c�utare:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentificare:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Cale:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Text ajutor cale"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Creez calea dac� nu exist�."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editare agend�"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Ad�ugare agend�"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Alege�i tipul de agend� pe care �l ave�i, �i introduce�i informa�iile "
+"relevante"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nume:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Text ajutor nume"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descriere:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Adaug�"
+msgid "Addressbook Sources"
+msgstr "Surse agend�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "�terg"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nume"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Ad�ugare"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editare"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Alte contacte"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Introduce�i parola pentru %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Nu pot deschide agenda"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "Orice c�mp con�ine"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Numele con�ine"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Email-ul con�ine"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Numele con�ine"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI pe care Folder Browser �l va afi�a"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Email principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Selectez un fi�ier"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Creaz� contact nou"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editare agend�"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Editare Informa�ii contact"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Ad�ugare la contacte"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Adresa email:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Dezactivare interog�ri"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Activare interog�ri (Periculos!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfa�a de selectare nume a agendei Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Configurare interfa�a de selectare nume a agendei"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Mut�"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Mut� tot"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Trimitere mail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Alte contacte"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Selec�ie nume"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Selec�ie nume din:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categorie:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Caut�"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versare:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Serviciu"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax serviciu"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacte..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorii..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalii"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Fi�ier ca..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Tip nou de telefon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_ti�e"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organiza�ie:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipuri de telefon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Primary Email"
-msgstr "Email principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Dori�i sa primi�i mail-uri _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Adresa paginii de web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Ad�ugare"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresa..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Nume asistent:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Ziua de na�tere:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Business"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compania:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contacte..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_�tergere"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nume complet..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Acas�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Func�ia:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Nume manager:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Porecl�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Birou:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_So�/so�ie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Aceasta este adresa de expediere"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "�terg persoana de contact?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Aceast� persoan� de contact apar�ine categoriilor:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Serviciu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Serviciu 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Rechemare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Ma�in�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Companie"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Adresa de acas�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Adresa de acas� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax acas�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Alte"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Alt Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Contact Ad�ugare-Rapid�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:227
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Editare complet�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:274
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Verific� adresa"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_�ara"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlanda"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "SUA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Localitate:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_C�su�a po�tal�:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stat/Provincie"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Cod _po�tal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Verificare nume"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "D-ra."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Dl."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "D-na."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Prenume:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nume:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Ini�iala tat�lui:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titlu:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Ca Minicard"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Ca tabel"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduce�i parola pentru %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Nu pot deschide agenda"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Nu pot deschide agenda. Aceasta inseamn�\n"
-"c� a�i introdus URI incorect sau a�i �ncercat\n"
-"s� accesa�i un server LDAP �i "
-"nu ave�i compilat suport pentru acesta.\n"
-"Dac� a�i introdus URI, verifica�i corectitudinea si reintroduce�i.\n"
-"Dac� nu, probabil a�i �ncercat s� accesa�i un server LDAP.\n"
-"Dac� dori�i s� folosi�i LDAP, trebuie s� desc�rca�i �i s�\n"
-"instala�i OpenLDAP �i s� recompila�i �i instala�i Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Afi�eaz� tot"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avansat..."
-
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
-msgstr "Orice c�mp con�ine"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Numele con�ine"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Email-ul con�ine"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "URI pe care Folder Browser �l va afi�a"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Alte contacte"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Fi�ier"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Tip de agend� necunoscut"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "F�r� (mod anonim)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/camel-sasl-plain.c:29 camel/providers/imap/camel-imap-provider.c:77
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:64 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Parola"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Tip de autorizare necunoscut"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Baza"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Unu"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Subarbore"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nume fi�ier:"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Decembrie"
 
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Memorez aceast� parol�"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Gazd�:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Text ajutor gazd�"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Text ajutor port"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "DN r�d�cin�"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Text ajutor DN r�d�cin�"
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Scop c�utare:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-msgid "Authentication:"
-msgstr "Autentificare:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Cale:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Text ajutor cale"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Creez calea dac� nu exist�."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Mut�"
 
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Editare agend�"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contacte"
 
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "Ad�ugare agend�"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contacte"
 
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
-"Alege�i tipul de agend� pe care �l ave�i, �i introduce�i informa�iile "
-"relevante"
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nume:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Text ajutor nume"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descriere:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Surse agend�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:593
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "�terg"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Editez"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
-msgid "Name"
-msgstr "Nume"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Dezactivare interog�ri"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Activare interog�ri (Periculos!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr "Editare Informa�ii contact"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
-msgid "Add to Contacts"
-msgstr "Ad�ugare la contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Control Bonobo pentru o adres� popup."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Control Bonobo pentru afi�area unei adrese."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Control Bonobo de prob� care afi�eaz� o agend�."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control care afi�eaz� o agend� minicard pentru Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Vizualizare agend� minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Component� Evolution pentru manipulare contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Configurare pentru controlul agendei minicard"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Contact nou"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Configurare pentru afi�orul agendei de adrese"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Alte contacte"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: 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?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Configurare pentru componentele agendei Evolution."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Alte contacte"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfa�a de selectare nume a agendei Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Configurare interfa�a de selectare nume a agendei"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Mut�"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
-msgid "Remove All"
-msgstr "Mut� tot"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "G�se�te..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selec�ie nume"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selec�ie nume din:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Caut�"
 
@@ -1170,73 +1300,258 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Salveaz� ca VCard"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Send contact to other"
+msgstr "Trimite contact la altcineva"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+msgid "Send message to contact"
+msgstr "Trimite mesaj la contact"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "Tip�re�te"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+msgid "Print Envelope"
+msgstr "Tip�re�te plic"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Surse"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Eroare necunoscut�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Lucreaz� offline"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Acces interzis"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Nu g�sesc fi�ierul"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Opera�ie nesuportat�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Anulat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Eroare I/O"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Eroarea la citirea datelor:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Click aici s� ad�uga�i un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+msgid "File As"
+msgstr "Fi�ier ca"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+msgid "Primary Phone"
+msgstr "Telefon principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+msgid "Assistant Phone"
+msgstr "Telefon asistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+#, fuzzy
+msgid "Business Phone"
+msgstr "Serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Rechemare"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+msgid "Company Phone"
+msgstr "Telefon companie"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+msgid "Home Phone"
+msgstr "Telefon acas�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organiza�ie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "Serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+msgid "Home Address"
+msgstr "Adresa acas�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr "Telefon ma�in�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+msgid "Home Phone 2"
+msgstr "Telefon acas� 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+msgid "Other Phone"
+msgstr "Alt telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+msgid "Other Address"
+msgstr "Alt� adres�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departament"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Birou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titlu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Porecl�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "So�/so�ie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Not�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #, fuzzy
-msgid "Click here to add a contact"
-msgstr "* Click aici s� ad�uga�i un contact *"
+msgid "Done."
+msgstr "Gata"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Incarc calendarul..."
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Salvez in agend�"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1250,7 +1565,7 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru creare Contact nou."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Vizualizare Card"
 
@@ -1279,7 +1594,8 @@ msgid "Dimensions:"
 msgstr "Dimensiuni:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Font..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1339,7 +1655,6 @@ msgid "Margins"
 msgstr "Margini"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Num�r de coloane"
 
@@ -1419,139 +1734,320 @@ msgstr "Tip"
 msgid "Width:"
 msgstr "L��ime:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Font..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Eroare in timpul comunic�rii cu serverul calendar"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Nu g�sesc fi�ierul"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+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:2
+msgid "Evolution calendar executive summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Component� Evolution pentru manipularea calendarului."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Procesator pentru componenta Centralizator a calendarului"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Deschide calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Procesator pentru componenta calendarului Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Procesator pentru controlul calendar iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Procesator pentru mostra controlului calendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Procesator pentru componenta calendarului Evolution."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Serviciu notificare alarme"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Arat� informa�ii despre Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarma �n %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "�nchide"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editare �nt�lniri"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Rezumat indisponibil."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Aminte�te de �nt�lnire la "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+"Este %s. Ora sistemului Unix este acum %ld. Ne-am g�ndit c� poate vrei s� "
+"stii."
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "Nu pot ini�ializa GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Nu pot ini�ializa Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Salvare calendar"
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 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:364 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:370 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confiden�ial"
 
-#: calendar/gui/calendar-model.c:373 calendar/gui/event-editor.c:1594
-#: calendar/gui/event-editor.c:1621
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: calendar/gui/calendar-model.c:461
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:461
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Ridicat"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
-#: calendar/gui/calendar-model.c:1573
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Sc�zut"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1123
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:544 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:639 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Nepornit"
 
-#: calendar/gui/calendar-model.c:642 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "�n derulare"
 
-#: calendar/gui/calendar-model.c:645 calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Complet"
 
-#: calendar/gui/calendar-model.c:648 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Anulat"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:795 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:798 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:803
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1562,7 +2058,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1570,17 +2066,21 @@ msgstr ""
 "'Neclasificat'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:897 calendar/gui/calendar-model.c:1121
-#: calendar/gui/calendar-model.c:1175 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:971
-#: mail/mail-accounts.c:116 mail/mail-config.glade.h:37
-#: shell/e-shell-view.c:1124 widgets/misc/e-cell-date-edit.c:234
-#: widgets/misc/e-dateedit.c:432 widgets/misc/e-dateedit.c:1341
-#: widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:971
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1590,137 +2090,292 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Valorile procentuale pot fi �ntre 0 �i 100, inclusiv"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioritatea poate fi 'Ridicat', 'Normal', 'Sc�zut', 'Nedefinit'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1065
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Nedefinit"
 
-#: calendar/gui/calendar-model.c:1106
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Nivelul de transparen�� poate fi 'Transparent', 'Opac', sau 'Inexistent'."
 
-#: calendar/gui/calendar-model.c:1575
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1577
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/calendar-model.c:1583
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1583
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nu"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Vizualizare Card"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "_S�pt�m�na de lucru"
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Eroare la �nc�rcarea calendarului</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Definire vizualizare"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Eroare la �nc�rcarea calendarului:</b>Metod� nesuportat�"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Luna"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Afi�eaza"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI afi�at de calendar"
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Arat� �nt�lnirile"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarm� audio"
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Arat� task-uri"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Incarc calendar"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Op�iuni afi�are"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI afi�at de calendar"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Aminte�te de �nt�lnire la "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Serviciu notificare alarme"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Stocare mesaje"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Scoate un sunet"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Nu pot ini�ializa GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Ruleaz� un program"
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma �n %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "zile"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificare depre �nt�lnire in %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualizez tot"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Rezumat indisponibil."
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "ore"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "�nchide"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editare �nt�lniri"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d zile"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " o zi"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d s�pt�m�ni"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 s�pt�m�n�"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d ore"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 or�"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minute"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minut"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d secunde"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 secund�"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Scoate un sunet"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Afi�eaz� toate antetele mesajului"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Trimite un email"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Ruleaz� un program"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "�nainte de �nceperea �nt�lnirii"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "dup� �ncepera �nt�lnirii"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "�nainte de sf�r�itul �nt�lnirii"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "dup� sf�r�itul �nt�lnirii"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Baza"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data & Ora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Memorator"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Rezumat:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Op�iuni"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "dup�"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "�nainte"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "ziua"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "sf�r�it �nt�lnire"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "ora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minut(e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "�nceput �nt�lnire"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1751,36 +2406,37 @@ msgid "60 minutes"
 msgstr "60 minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Oprire alarm� dupa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarm� audio"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Beep c�nd apare fereastra alarmei"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferin�e calendar"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Culori"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Op�iuni pentru navigatorul datei"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1788,584 +2444,1082 @@ msgid "Defaults"
 msgstr "Implicit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Op�iuni afi�are"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Afi�eaza"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Data scadent�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Validez mo��ire pentru"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Sfir�it zi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Prima zi a s�pt�minii:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Vin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Vineri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Ilumineaz�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "De terminat ast�zi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "De terminat ast�zi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Neteminate �nc�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Neterminate �nc�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Luni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Termen dep�it"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
 msgstr "Termen dep�it"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Alege o culoare"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioritate"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Aminte�te-mi toate �nt�lnirile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Memorator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "S�m"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "S�mb�t�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Arat�"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Arat� termenul de final al �nt�lnirilor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Arat� num�rul de s�pt�m�ni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "�nceput zi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Duminic�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Panou sarcini"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Sarcini"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "De terminat ast�zi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Timp r�mas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titlu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Distribu�ia de timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr "Distribu�ia de timp:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Mar�i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarme vizuale"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "S�pt�m�n� lucr�toare"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "_S�pt�m�na de lucru"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minute �nainte de a avea loc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "secunde"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Sunte�i sigur c� dori�� s� �terge�i task-ul `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i intrarea din jurnal `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Complet"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Complet"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Data scadent�"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editare �nt�lnire"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "�nt�lnire - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Task - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Intrare jurnal - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Nu exist� rezumat"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Suprascrie�i fi�ierul?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fi�ier al c�rui nume exist� deja.\n"
+"�l suprascrie�i?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Salveaz� ca..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, 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:73
+#: calendar/gui/dialogs/delete-comp.c:87
 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:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sunte�i sigur c� dori�� s� �terge�i task-ul `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sunte�i sigur c� dori�� s� �terge�i acest task?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, 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:91
+#: calendar/gui/dialogs/delete-comp.c:105
 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/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Dori�i s� salva�i modific�rile?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i �nt�lnirea `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_let:"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Sunte�i sigur c� dori�� s� �terge�i task-ul `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i intrarea din jurnal `%s'?"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selectez un fi�ier"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sec�iuni"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "Distribu�ia de timp:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "�nt�lnire"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Reaminte�te"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Revenire"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Anulare �nt�lnire"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Eveniment zilnic"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificare"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data & Ora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data completat�:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Progres"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data de �nceput:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Rezu_mat:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Task"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confiden�ial"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contacte..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Ora de _sf�r�it"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Data scadent�:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Ora de �nceput"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritate:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Stare"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nume grup:"
 
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Editare task"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Sursa hirtie"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:381
-msgid "No summary"
-msgstr "Nu exist� rezumat"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Appointment - %s"
-msgstr "�nt�lnire - %s"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Scaun"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:390
-#, c-format
-msgid "Task - %s"
-msgstr "Task - %s"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Participant necesar"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:393
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Intrare jurnal - %s"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Participant op�ional"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Categorii"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Neparticipant"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Mut� ac�iunea"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Accept� "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Refuz� "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativ�"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "�terse"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "�n derulare"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon ma�in�"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participant necesar"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Participant op�ional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Neparticipant"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Trimis"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "�terge..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Participare"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Data terminare"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Data sf�r�it"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "�terse"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Data �nceput"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "�terse"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Pozi�ie geografic�"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Manager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Decembrie"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rol"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stare"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tip"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizer:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizer:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Invit� pe al�ii..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizer:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+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:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Rezumat"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "ziua"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Transparen��"
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarme"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Click aici s� ad�uga�i un task"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Revenire personal�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Fiecare"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Excep�ii"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Nici o revenire"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Previzualizare"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regul� revenire"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Revenire simpl�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modific�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "pentru"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "�ntotdeauna"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "luna"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "p�n� la"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "s�pt�m�na"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data completat�:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "�terse"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "�terse"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "(F�r� nume)"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Task"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_let:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Progres"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de �nceput:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Data scadent�:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioritate:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Stare"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marcare complet�"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Deschide"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marcare task complet�"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Taie"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiaz�"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Editez acest task..."
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Lipe�te"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Editare task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcare complet�"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "�terg acest task"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcare complet�"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "�tergere task"
 
-#: calendar/gui/e-day-view-time-item.c:520
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Click aici s� ad�uga�i un task"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_let:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarme"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorii"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Complet"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Data terminare"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Data scadent�"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Data sf�r�it"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Pozi�ie geografic�"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritate"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data �nceput"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Rezumat"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Sarcini"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparen��"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
 #, 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:274 calendar/gui/e-day-view.c:1290
-#: calendar/gui/e-week-view-main-item.c:324
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
-#: calendar/gui/e-week-view-main-item.c:333
-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:282 calendar/gui/e-day-view.c:1317
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 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:572 calendar/gui/e-week-view.c:304
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:307
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3244
-msgid "New All Day Event"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "_Eveniment nou"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3249
-msgid "Go to Today"
-msgstr "Mergi la ziua"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3251
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3257
-#: mail/folder-browser.c:562 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Deschide"
-
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3259
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "�terge aceast� �nt�lnire"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3261
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Programare �nt�lniri"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Salveaz� fi�ierul curent"
 
-#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3274
-msgid "Make this Occurrence Movable"
-msgstr ""
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "�terge toate apari�iile"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "�terge toate apari�iile"
 
-#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3276
-msgid "Delete this Occurrence"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3069
-msgid "Delete all Occurrences"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Aceasta este adresa de expediere"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Component� actualizat� cu succes."
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "A fost o eroare la �nc�rcarea calendarului."
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Nu pot deschide fi�ierul calendar!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Mesajul nu este disponibil �n mod curent"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Nu pot �nc�rca fi�ierul calendar!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Nu pot citi fi�ierul calendar!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Acesta e un r�spuns de la cineva care n-a fost invitat!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Nu pot �terge compenentele calendarului!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Component� �tears� cu succes."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Nu recunosc acest tip de component� a calendarului."
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Adaug� �n calendar"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Accept� "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Folderul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Refuz� "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Inten�ie "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr " Actualizeaz� calendar"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Anulare �nt�lnire"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Nu pot deschide fi�ierul calendar!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2380,26 +3534,22 @@ msgstr "--la--"
 msgid "Calendar Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Incarc calendar"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Incarc calendarul..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizer:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mesaj server:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Rezumat:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "dat� sf�r�it"
@@ -2408,102 +3558,21 @@ msgstr "dat� sf�r�it"
 msgid "date-start"
 msgstr "dat� sf�r�it"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Participare"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adrese participare"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Particip�ri"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Anulare\n"
-"�nt�lnire"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Scaun"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Invita�ii �nt�lnire"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Neparticipant"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Participant op�ional"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizator:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Public�\n"
-"Eveniment"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Cerere\n"
-"�nt�lnire"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Participant necesar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Program\n"
-"Ora"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1050
-msgid "Status"
-msgstr "Stare"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Tot"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categorie:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nu pot inc�rca task-uri �n `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
@@ -2511,290 +3580,22 @@ msgstr "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 #. 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/e-week-view-main-item.c:341
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3242 calendar/gui/e-week-view.c:3265
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
 
-#: calendar/gui/e-week-view.c:3278
-msgid "Delete All Occurrences"
-msgstr "�terge toate apari�iile"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Eveniment zilnic"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "�nt�lnire"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Revenire personal�"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Fiecare"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excep�ii"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modific�"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Nici o revenire"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1581
-msgid "Play a sound"
-msgstr "Scoate un sunet"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Previzualizare"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Revenire"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regul� revenire"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Reaminte�te"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1590
-msgid "Run a program"
-msgstr "Ruleaz� un program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1587
-msgid "Send an email"
-msgstr "Trimite un email"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Set�ri..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1584
-msgid "Show a dialog"
-msgstr "Arat� un dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Revenire simpl�"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Ora de _sf�r�it"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Ora de �nceput"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Data �nceput:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
-msgid "after"
-msgstr "dup�"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
-msgid "before"
-msgstr "�nainte"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "ziua"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "sf�r�it �nt�lnire"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "pentru"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "�ntotdeauna"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "ora"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minut(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "luna"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "�nceput �nt�lnire"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "p�n� la"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "s�pt�m�na"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "anul"
-
-#: calendar/gui/event-editor.c:375
-msgid "Edit Appointment"
-msgstr "Editare �nt�lnire"
-
-#: calendar/gui/event-editor.c:453
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:478 filter/filter-datespec.c:65
-msgid "day"
-msgstr "ziua"
-
-#: calendar/gui/event-editor.c:605
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:612
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:758
-msgid "occurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:875
-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/event-editor.c:1536
-#, c-format
-msgid " %d days"
-msgstr " %d zile"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 day"
-msgstr " o zi"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d weeks"
-msgstr " %d s�pt�m�ni"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 week"
-msgstr " 1 s�pt�m�n�"
-
-#: calendar/gui/event-editor.c:1546
-#, c-format
-msgid " %d hours"
-msgstr " %d ore"
-
-#: calendar/gui/event-editor.c:1548
-msgid " 1 hour"
-msgstr " 1 or�"
-
-#: calendar/gui/event-editor.c:1551
-#, c-format
-msgid " %d minutes"
-msgstr " %d minute"
-
-#: calendar/gui/event-editor.c:1553
-msgid " 1 minute"
-msgstr " 1 minut"
-
-#: calendar/gui/event-editor.c:1556
-#, c-format
-msgid " %d seconds"
-msgstr " %d secunde"
-
-#: calendar/gui/event-editor.c:1558
-msgid " 1 second"
-msgstr " 1 secund�"
-
-#: calendar/gui/event-editor.c:1605
-msgid " before start of appointment"
-msgstr "�nainte de �nceperea �nt�lnirii"
-
-#: calendar/gui/event-editor.c:1607
-msgid " after start of appointment"
-msgstr "dup� �ncepera �nt�lnirii"
-
-#: calendar/gui/event-editor.c:1615
-msgid " before end of appointment"
-msgstr "�nainte de sf�r�itul �nt�lnirii"
-
-#: calendar/gui/event-editor.c:1617
-msgid " after end of appointment"
-msgstr "dup� sf�r�itul �nt�lnirii"
-
-#: calendar/gui/event-editor.c:3117 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-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:2
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Component� Evolution pentru manipularea calendarului."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Procesator pentru componenta Centralizator a calendarului"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Procesator pentru componenta calendarului Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Procesator pentru controlul calendar iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Procesator pentru mostra controlului calendar"
-
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide folderul �n `%s'"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerut� pentru deshiderea `%s' nu e suportat�"
@@ -2820,236 +3621,256 @@ msgid "Go To Date"
 msgstr "Mergi la data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Mergi la ziua de azi"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Ianuarie"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Iulie"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Iunie"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Martie"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Noiembrie"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Octombrie"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Mergi la ziua de azi"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Du"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Jo"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "S�"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Sarcini"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Ziua curent� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "S�pt�m�na curent� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Luna curent� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1403
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:30
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Previzualizare tip�rire"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Tip�re�te acest articol"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Seteaz� tip�rire"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "De afi�at URI pentru folderul sarcini"
 
@@ -3057,8 +3878,9 @@ msgstr "De afi�at URI pentru folderul sarcini"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution a preluat sarcinile care au fost in folderul calendar"
-"�i le-a transferat �ntr-un nou folder de sarcini."
+msgstr ""
+"Evolution a preluat sarcinile care au fost in folderul calendar�i le-a "
+"transferat �ntr-un nou folder de sarcini."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3066,85 +3888,132 @@ msgid ""
 "migrate them to the new tasks folder.\n"
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
-msgstr "Evolution a �ncercat s� preia sarcinile care au fost �n folderul calendar"
-"�i le-a transferat �ntr-un nou folder de sarcini."
-"C�teva sarcini nu pot fi transferate, a�a c� acest proces se poate"  
-"relua �n viitor"  
+msgstr ""
+"Evolution a �ncercat s� preia sarcinile care au fost �n folderul calendar�i "
+"le-a transferat �ntr-un nou folder de sarcini.C�teva sarcini nu pot fi "
+"transferate, a�a c� acest proces se poaterelua �n viitor"
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "Nu pot deschide `%s'; nici un articol din folderul calendar nu va fi transferat"
-"�n folderul de sarcini"
+msgstr ""
+"Nu pot deschide `%s'; nici un articol din folderul calendar nu va fi "
+"transferat�n folderul de sarcini"
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr "Metoda cerut� pentru a �nc�rca `%s' nu e suportat�; nici un articol din"
-"folderul calendar nu va fi transferat �n folderul de sarcini"
+msgstr ""
+"Metoda cerut� pentru a �nc�rca `%s' nu e suportat�; nici un articol "
+"dinfolderul calendar nu va fi transferat �n folderul de sarcini"
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-cipher-context.c:171
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat �n acest� stocare"
+
+#: camel/camel-cipher-context.c:211
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat �n acest� stocare"
+
+#: camel/camel-cipher-context.c:251
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat �n acest� stocare"
+
+#: camel/camel-cipher-context.c:294
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat �n acest� stocare"
+
+#: camel/camel-cipher-context.c:336
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat �n acest� stocare"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+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:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide folderul"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa folderul"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj &d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "E�uare mesaj %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizare folder"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Complet"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:870
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare executare filtru: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare executare filtru c�utare: %s: %s"
@@ -3154,7 +4023,8 @@ msgstr "Eroare executare filtru c�utare: %s: %s"
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
-msgstr "Nu pot parsa expresia de c�utare: %s:\n"
+msgstr ""
+"Nu pot parsa expresia de c�utare: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:338
@@ -3162,7 +4032,8 @@ msgstr "Nu pot parsa expresia de c�utare: %s:\n"
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
-msgstr "Eroare executare expresia c�utare: %s:\n"
+msgstr ""
+"Eroare executare expresia c�utare: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
@@ -3178,311 +4049,432 @@ msgstr "Execut� interogare �n header necunoscut: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tip invalid �n con�inutul mesajului, preferabil �ir"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nu pot crea conducta: %s"
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nu pot bifurca: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, 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:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, 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."
+msgstr ""
+"Timp expirat la �ncercarea de blocare a fi�ierului %s. �ncerca�i mai t�rziu."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, 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:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "E�uare la blocare prin folosirea flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nu pot verifica fi�ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nu pot deschide fi�ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nu pot deschide fi�ierul temporar de mesaje %s: %s"
 
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Nu pot testa fi�ierul de blocare pentru %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Eroare la citirea fi�ierului cu mesaje: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Eroare la scrierea fi�ierului cu mesaje temporar: %s"
-
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:159
 #, 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:304
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nu pot crea conducta: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nu pot bifurca: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "E�uare program de mutare mesaje: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Eroare necunoscut�)"
 
-#: camel/camel-movemail.c:585
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Eroare la citirea fi�ierului cu mesaje: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Eroare la copierea fi�ierului cu mesaje temporar: %s"
 
-#: camel/camel-provider.c:128
+#: camel/camel-pgp-context.c:193
+#, 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:196
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "V� rog introduce�i fraza de trecere %s"
+
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr "Nici o parol� dat�."
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nu pot crea conducta la PGP/GPG: %s"
+
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nu pot crea fi�ier temp: %s"
+
+#: camel/camel-pgp-context.c:1063
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Clic pe icon pentru decriptare."
+
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
+msgstr "Nici un destinatar specificat"
+
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nu pot �nc�rca %s: Modulul de �nc�rcare nu e suportat �n acest sistem"
 
-#: camel/camel-provider.c:137
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nu pot �nc�rca %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nu pot �nc�rca %s: Nu exist� cod de ini�ializare �n modul"
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pentru %s �n %s"
 
-#: camel/camel-remote-store.c:237
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Conexiune anulat�"
 
-#: camel/camel-remote-store.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nu m� pot conecta la %s (port %d): %s"
 
-#: camel/camel-remote-store.c:241
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(gazd� necunoscut�)"
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:384
-#: camel/camel-remote-store.c:455
-#: camel/providers/imap/camel-imap-command.c:263
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Opera�ie anulat�"
 
-#: camel/camel-remote-store.c:461
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server deconectat nea�teptat"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr "Aceast� op�iune v� va conecta la server folosind o parol� simpl�."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "E�uare la autentificare."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
-msgstr "Urm� l�sat� de adresa de email invalid�:\n"
+msgstr ""
+"Urm� l�sat� de adresa de email invalid�:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:32
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Aceast� op�iune v� va conecta la server folosind o parol� CRAM-MD5, dac�"
-"serverul suport�."
+msgstr ""
+"Aceast� op�iune v� va conecta la server folosind o parol� CRAM-MD5, "
+"dac�serverul suport�."
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:41
+#: 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."
-msgstr "Aceast� op�iune v� va conecta la server folosind o parol� DIGEST-MD5, dac�"
-"serverul suport�."
+msgstr ""
+"Aceast� op�iune v� va conecta la server folosind o parol� DIGEST-MD5, "
+"dac�serverul suport�."
 
-#: camel/camel-sasl-digest-md5.c:799
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:808
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:814
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:836
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "R�spunsul serverului nu con�ine datele de autorizare\n"
 
-#: camel/camel-sasl-digest-md5.c:854
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "R�spunsul serverului con�ine date de autorizare incomplete\n"
 
-#: camel/camel-sasl-digest-md5.c:864
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Acest� op�iune v� va conecta la server folosind autentificare Kerberos 4"
+msgstr ""
+"Acest� op�iune v� va conecta la server folosind autentificare Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
-msgstr "Nu pot lua tichetul Kerberos:\n"
+msgstr ""
+"Nu pot lua tichetul Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "R�spuns de la server de autentificare e�uat�."
 
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "Aceast� op�iune v� va conecta la server folosind o parol� simpl�."
 
-#: camel/camel-search-private.c:109
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "E�uare la autentificare."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilarea expresiei regulate e�uat�: %s: %s"
 
-#: camel/camel-service.c:139
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necesit� o component� username"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necesit� o component� host"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesit� o component� de cale"
 
-#: camel/camel-service.c:484
+#: camel/camel-service.c:548
 #, c-format
-msgid "No such host %s."
-msgstr "Nu exist� host-ul %s."
+msgid "Resolving: %s"
+msgstr ""
 
-#: camel/camel-service.c:487
+#: camel/camel-service.c:575
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Incapabil temporar s� caut hostname %s."
+msgid "Failure in name lookup: %s"
+msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:600
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citire mail ca o interogare a altui set de foldere"
 
-#: camel/camel-session.c:271 camel/camel-session.c:361
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nici un provider valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:459
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
-msgstr "Nu pot crea directorul %s:\n"
+msgstr ""
+"Nu pot crea directorul %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:379 mail/mail-ops.c:1001 mail/mail-ops.c:1008
-#: mail/mail-ops.c:1026 mail/mail-ops.c:1027
-msgid "Trash"
-msgstr "Gunoi"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "V� rog introduce�i %s fraza de trecere pentru %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Acest fi�ier nu exist�."
 
-#: camel/camel-tcp-stream-ssl.c:346
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Acest fi�ier nu exist�."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Esuare la trimiterea numelui utilizator la server"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "E�uare mesaj %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"EMail: %s\n"
-"Nume: %s\n"
-"Unitate: %s\n"
-"Organiza�ie: %s\n"
-"Localitate: %s\n"
-"Stat: %s\n"
-"�ara: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:362
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3495,19 +4487,38 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Dori�i s� accepta�i oricum?" 
+"Dori�i s� accepta�i oricum?"
 
-#: camel/camel-url.c:286
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"EMail: %s\n"
+"Nume: %s\n"
+"Unitate: %s\n"
+"Organiza�ie: %s\n"
+"Localitate: %s\n"
+"Stat: %s\n"
+"�ara: %s"
+
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nu exist� mesajul %s �n %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Nu exist� mesajul: %s"
@@ -3516,120 +4527,137 @@ msgstr "Nu exist� mesajul: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nu po�i copia mesaje din acest folder"
 
-#: camel/providers/imap/camel-imap-command.c:208
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Eroare necunoscut�"
-
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "R�spunsul serverului terminat prea repede."
 
-#: camel/providers/imap/camel-imap-command.c:455
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�spunsul serverului IMAP nea�teptat OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:171
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Nu pot crea directorul %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot �nc�rca rezumatul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:350
-msgid "Scanning IMAP folder"
-msgstr "Scanez folderul IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:985
-#: camel/providers/imap/camel-imap-folder.c:1189
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Salvez mesaje"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil �n mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:1015
-#: camel/providers/imap/camel-imap-folder.c:1223
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Salvez mesaje"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 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:128
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:40 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
-#: camel/providers/imap/camel-imap-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi �n toate folderele"
 
-#: camel/providers/imap/camel-imap-provider.c:45 shell/e-shell-view.c:479
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Foldere"
 
-#: camel/providers/imap/camel-imap-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr "Arat� numai foldere subscrise"
 
-#: camel/providers/imap/camel-imap-provider.c:49
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:51
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "Nume spa�iu"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplic� filtrele pe mesajele noi din INBOX pe acest server"
 
-#: camel/providers/imap/camel-imap-provider.c:60
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pentru citirea �i stocarea mesajelor pe servere IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:79
+#: camel/providers/imap/camel-imap-provider.c:82
 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 "
+msgstr ""
+"Aceast� op�iune v� va conecta la serverul IMAP folosind o parol� �n clar "
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:453
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:493
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Nu a�i introdus o parol�."
 
-#: camel/providers/imap/camel-imap-store.c:521
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3640,93 +4668,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Nu pot crea directorul %s: %s"
+msgid "No such folder %s"
+msgstr "Nu exist� folderul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 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:46
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Fi�ier c�su�� po�tal� �n format standard Unix"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Pentru stocarea mail-urilor locale �n format standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:56
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Fi�ier �n format qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Pentru stocarea mail-urilor locale �n directoare qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Fi�ier �n format qmail maildir"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Pentru stocarea mail-urilor locale �n directoare qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Stocare root %s nu e o cale absolut�"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Stocare root %s nu e director obi�nuit"
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nu pot g�si folderul: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "Stoc�rile locale nu au un inbox"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fi�ier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi folderul %s �n %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nu pot �terge directorul sumar al fi�ierelor `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nu pot �terge directorul index al fi�ierelor `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la folderul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3735,19 +4778,20 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Nu exist� mesaj"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Con�inut invalid al mesajului"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3756,15 +4800,15 @@ msgstr ""
 "Nu pot deschide folderul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folderul `%s' nu exist�."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3773,35 +4817,58 @@ msgstr ""
 "Nu pot crea folderul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:129
 #, 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:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot �terge folderul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Nu pot crea folderul `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Nu pot g�si folderul: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, 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:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, 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:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3810,15 +4877,17 @@ msgstr ""
 "Nu pot lua mesajul: %s din folderul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folderul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 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:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3827,7 +4896,7 @@ msgstr ""
 "Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3836,14 +4905,14 @@ msgstr ""
 "Nu pot crea fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nu e un fi�ier obi�nuit."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3852,162 +4921,239 @@ msgstr ""
 "Nu pot �terge folderul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folderul `%s' nu e gol. Ne�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:244
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Rezumare folder"
 
-#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nu pot deschide folderul: %s: rezumare de la pozi�ia %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:292
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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 folderul %s"
 
-#: camel/providers/local/camel-mbox-summary.c:367
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nu pot rezuma folderul: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699 mail/mail-ops.c:1387
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizare folder"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
+#: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nu pot deschide folderul pentru rezumare: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, 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: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-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:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Rezumatul �i folderul defecte, chiar dup� o sincronizare"
 
-#: camel/providers/local/camel-mbox-summary.c:596
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, 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:613
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "E�uare la scrierea �n c�su�a po�tal�: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nu pot �nchide folderul surs� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot �nchide folderul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi folderul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscut�: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la folderul mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nu e director"
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Nu pot ad�uga mesajul la fi�ierul mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' nu e un fi�ier obi�nuit."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Folderul `%s' nu exist�."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Stoc�rile locale nu au un inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Fi�ier mail-uri locale %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Nu pot deschide fi�ierul temporar de mesaje %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Nu pot �nchide folderul surs� %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Nume utilizator rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Esuare la trimiterea numelui utilizator la server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Nume utilizator/parol� rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mesajul %s neg�sit."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 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:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapabil s� �ncarc fi�ierul list� de grup pentru %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapabil s� salvez fi�ierul list� de grup pentru: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 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 news USENET."
+msgstr ""
+"Acesta e un provider pentru citirea din �i postarea �n grupuri de news "
+"USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 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 "
+"Aceast� optiune v� va autentifica la serverul NNTP folosind o parol� �n clar "
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapabil s� deschid sau s� creez fi��erul .newsrc pentru %s: %s"
@@ -4045,73 +5191,73 @@ msgstr "Nu pot aduce mesajul: %s"
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nu pot recupera mesajul de la serverul POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Stocare mesaje"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Leave messages on server"
 msgstr "Las� mesajele pe server"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: 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:45 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:47
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 "Pentru conectare la servere POP. Protocolul POP poate fi deasemenea folosit "
-"pentru aducerea mailurior de la anumi�i provideri de web mail �i sisteme de email proprietare."
+"pentru aducerea mailurior de la anumi�i provideri de web mail �i sisteme de "
+"email proprietare."
 
-#: camel/providers/pop3/camel-pop3-provider.c:66
+#: 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 ""
-"Aceast� op�iune v� va conecta la serverul POP folosind o parol� �n clar. Aceasta "
-"este singura op�iune suportat� de majoritatea serverelor POP."
+"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:76
+#: 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 "Aceast� op�iune v� va conecta la serverul POP "
 
-#: camel/providers/pop3/camel-pop3-provider.c:88
+#: 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 ""
-"Conectare la server POP folosind Kerberos 4 la autentificare."
+msgstr "Conectare la server POP folosind Kerberos 4 la autentificare."
 
-#: camel/providers/pop3/camel-pop3-store.c:204
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, 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:220
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nu m� pot conecta la serverul: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:324
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, 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:363
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, 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:382
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4120,12 +5266,12 @@ msgstr ""
 "Conectare la serverul POP e�uat�.\n"
 "Eroare la trimiterea numelui utilizatorului: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:385
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Necunoscut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4133,7 +5279,7 @@ msgstr ""
 "Conectare la serverul POP e�uat�.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4142,433 +5288,485 @@ msgstr ""
 "Conectare e�uat� la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:488
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu exist� folderul `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:57
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" �n "
+msgstr ""
+"Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" �n "
 "sistemul local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nu pot crea leg�tura c�tre sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nu pot face fork la sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nu pot trimite mesajul: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, 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:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, 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:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, 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:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "Nu g�sesc adresa 'De la' �n mesaj"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
 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"
+msgstr ""
+"Pentru trimiterea mailului prin conectare la un hub de mailuri distant "
+"folosind SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Eroare de sintax�, comand� nerecunoscut�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comanda neimplementat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parametru al comenzii neimplementat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Starea sistemului, sau r�spuns de ajutor al sistemului"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mesaj de ajutor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Service terminat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Service-ul �nchide canalul de transmisie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Service-ul invalid, canal de transmisie �nchis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Ac�iunea cerut� de mail terminat� �n regul�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilizatorul nu e local: �naintez la <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:189
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Ac�iunea cerut� anulat�: eroare la procesare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Utilizatorul nu este local; �ncerca�i v� rog <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Ac�iunea cerut� refuzat�: posibilitatea de stocare a sistemului insuficient�"
+msgstr ""
+"Ac�iunea cerut� refuzat�: posibilitatea de stocare a sistemului insuficient�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:202
 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:206
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Tranzac�ie e�uat�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "E nevoie de o tranzi�ie a parolei"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Mecanismul de autenticare este prea slab"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Mecanismul de autentificare cerut necesit� criptare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "E�uare temporar� a autentific�rii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:374
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "Serverul IMAP %s nu suport� tipul cerut de autentificare %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:509
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Autentificare la serverul IMAP e�uat�.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinit�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:543
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Trimit mesaj"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar nedefinit."
 
-#: camel/providers/smtp/camel-smtp-transport.c:651
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Comanda HELO a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:705
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentificare"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:775
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Comanda AUTH a expirat: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "R�spuns de la server: autentificare e�uat�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:819
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:844
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:863
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:894
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:913
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:928
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:965
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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"
+msgstr ""
+"DATA r�spuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET timp expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET r�spuns de eroare: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Comanda QUIT a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT r�spuns de eroare: %s: nefatal"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "ata�"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Ata�eaz� un fisier"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de ata�uri"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Adaug� ata�..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Ata�ez� un fi�ier la mesaj"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1050
-msgid "Attachment"
-msgstr "Ata�"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propriet��ile ata�ului"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nume fi�ier:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Ata� inline"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tip MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Timite ca:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Click aici pentru agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "R�spuns la:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:395
 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:384
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"Introduce�i adresele care vor primi o copie a mesajului f�r� s� apar� �n"
-"lista destinatarilor mesajului"
+"Introduce�i adresele care vor primi o copie a mesajului f�r� s� apar� "
+"�nlista destinatarilor mesajului"
 
-#: composer/e-msg-composer.c:519
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Ata�eaz� un fisier"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Nu pot deschde fi�ierul semn�tur� %s:\n"
+"Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Eroare la �nc�rcarea fi�ierului: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salveaz� ca..."
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Avertisment"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:738
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:810
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4576,59 +5774,82 @@ msgstr ""
 "Nu pot descide folderul cu ciorne pentru acest cont.\n"
 "Dori�i s� folosi�i folderul cu ciorne implicit?"
 
-#: composer/e-msg-composer.c:868 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Eroare la salvarea fi�ierului: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Nu pot recupera mesajul de la serverul POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nu pot crea fi�ierul de ie�ire: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Nu pot crea fi�ierul de ie�ire: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Eroare �n timpul salv�rii mesajului la: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution a g�sit fi�iere de mail Pine.\n"
+"Dori�i s� le importa�i �n Evolution?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr "Dori�i s� salva�i modific�rile?"
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Deschid fi�ier"
 
-#: composer/e-msg-composer.c:1025
-msgid "That file does not exist."
-msgstr "Acest fi�ier nu exist�."
-
-#: composer/e-msg-composer.c:1035
-msgid "That is not a regular file."
-msgstr "Acesta nu este un fi�ier normal."
-
-#: composer/e-msg-composer.c:1045
-msgid "That file exists but is not readable."
-msgstr "Acest fi�ier exist� dar nu se poate citi."
-
-#: composer/e-msg-composer.c:1055
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Acest fi�ier pare accesibil dar open(2) a e�uat."
-
-#: composer/e-msg-composer.c:1077
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Fi�ierul este foarte mare (mai mare de 100k).\n"
-"Sunte�i sigur c� vre�i s�-l insera�i?"
-
-#: composer/e-msg-composer.c:1098
-msgid "An error occurred while reading the file."
-msgstr "A ap�rut o eroare �n timpul citirii fi�ierului."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Insereaz� fi�ier text..."
 
-#: composer/e-msg-composer.c:1399 composer/e-msg-composer.c:1731
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:1820
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nu pot crea fereastra de compunere."
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4636,7 +5857,7 @@ 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:367
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nu pot ini�ializa compozitorul Evolution."
 
@@ -4653,302 +5874,122 @@ msgid "calendar information"
 msgstr "informa�ie calendar"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:474
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:96 e-util/e-time-utils.c:207
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:470
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2500
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:282
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:314
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:322
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Componenta Evolution pentru rezumatul activit��ilor."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Procesator pentru componenta rezumat al activit��ilor."
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nu pot ini�ializa componenta Evolution pentru rezumatul activit��ilor."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Pute�i alege o alt� pagin� HTML pentru fundalul rezumatului activit��ilor.\n"
-"\n"
-"Pentru cel implicit l�sa�i-l gol"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Deschide %s cu aplica�ia implicit� GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Deschide %s cu navigatorul web implicit GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Trimite un email la %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Schimb� vederea cu %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Rulez %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "�nchid %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mut� %s la st�nga"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mut� %s la dreapta"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mut� %s �n r�ndul precedent"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mut� %s �n r�ndul urm�tor"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configurez %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nu pot deschide fi�ierul HTML: \n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Eroarea la citirea datelor:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Fi�ierul nu are un loc pentru servicii.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aparen��"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fundal:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Componenta rezumat al activit��ilor nu poate ini�ializa Bonobo.\n"
-"Dac� a fost un mesaj de avertisment despre RootPOA, probabil a�i\n"
-"compilat Bonobo cu GOAD in loc de OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Procesator pentru rezumatul RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Rezumat RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Procesator pentru componenta de test bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Procesator pentru componenta de test."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Service bonobo de test"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Service de test"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Eroare"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Actualizare automat�"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Actualizez acum"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Actualizez tot"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minute"
-
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "an"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "ani"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "lun�"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "luni"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "s�pt�m�n�"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "s�pt�m�ni"
 
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "zile"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "or�"
 
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "ore"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "secund�"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "secunde"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Ai uitat s� alegi o dat�."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Ai ales o dat� invalid�."
 
-#: filter/filter-datespec.c:260
+#: 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"
@@ -4957,7 +5998,7 @@ msgstr ""
 "Data mesajului va fi comparat� indiferent dac�\n"
 "filtrul ruleaz� sau vfolder este deschis."
 
-#: filter/filter-datespec.c:283
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4965,7 +6006,7 @@ msgstr ""
 "Data mesajului va fi comparat� indiferent\n"
 "de ora specificat� aici."
 
-#: filter/filter-datespec.c:323
+#: 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"
@@ -4976,50 +6017,53 @@ msgstr ""
 "\"s�pt�m�na trecut�\", de exemplu."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "ora curent�"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "ora specificat�"
 
-#: filter/filter-datespec.c:359
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "o or� relativ� la ora curent�"
 
 #. The label
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Compara fa�� de"
 
-#: filter/filter-datespec.c:534 filter/filter-datespec.c:694
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "acum"
 
-#: filter/filter-datespec.c:691
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<click aici pentru a specifica o dat�>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Reguli filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:423
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Atunci"
 
-#: filter/filter-filter.c:436
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Adaug� ac�iune"
 
-#: filter/filter-filter.c:442
-#, fuzzy
-msgid "Remove action"
-msgstr "Mut� ac�iunea"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -5027,20 +6071,20 @@ msgstr ""
 "Oops, a�i uitat s� alege�i un folder.\n"
 "V� rog merge�i �napoi �i preciza�i un folder s� livrez mailul."
 
-#: filter/filter-folder.c:221 filter/vfolder-rule.c:279
-#: mail/mail-account-gui.c:680
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Alege folderul"
 
-#: filter/filter-folder.c:246
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Introdu folder URI"
 
-#: filter/filter-folder.c:292
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<clic aici s� alege�i un folder>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5049,50 +6093,57 @@ msgstr ""
 "Eroare �n expresia regulat� '%s':\n"
 "%s"
 
-#: filter/filter-part.c:466
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:599
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nume regul�:"
 
-#: filter/filter-rule.c:603
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "F�r� titlu"
 
-#: filter/filter-rule.c:619
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Dac�"
 
-#: filter/filter-rule.c:636
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Execut� ac�iunile"
 
-#: filter/filter-rule.c:640
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "dac� toate criteriile sunt �ndeplinite"
 
-#: filter/filter-rule.c:645
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "dac� oricare criteriu e �ndeplinit"
 
-#: filter/filter-rule.c:656
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Adaug� criteriu"
 
-#: filter/filter-rule.c:662
-msgid "Remove criterion"
-msgstr "Scoate criteriu"
-
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "intr�"
 
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "iese"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Adaug�"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editez"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Editeaz� filtre"
@@ -5109,7 +6160,7 @@ msgstr "Intr�"
 msgid "Outgoing"
 msgstr "Iese"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Foldere virtuale"
 
@@ -5133,370 +6184,517 @@ msgstr "cu toate folderele locale �i distante active"
 msgid "with all local folders"
 msgstr "cu toate folderele locale"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
 msgstr "Atribuie culoare"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Atribuie punctaj"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Ata�uri"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "con�ine"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiaz� �n folder"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date recep�ionate"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�terse"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "nu con�ine"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nu se termin� cu"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "nu exist�"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "nu sun� ca"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "nu �ncepe cu"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Nu exist�"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Ciorn�"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "se termin� cu"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Exist�"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "exist�"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "�nainteaz� la adresa"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "este"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "e mai mare dec�t"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "e mai mic dec�t"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "nu este"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Mesajul a fost recep�ionat"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Mesajul a fost trimis"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mut� in folder"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "�n sau dup�"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "�n sau �nainte"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Cite�te"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "R�spuns la"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:193 filter/score-rule.c:195
-#: mail/message-list.c:1050
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Seteaz� starea"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "M�rime"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "sun� ca"
+
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "Cont"
+
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "�ncepe cu"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.c:1051
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Subiect"
 
-#: filter/libfilter-i18n.h:35
-msgid "contains"
-msgstr "con�ine"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "a fost dup�"
 
-#: filter/libfilter-i18n.h:36
-msgid "does not contain"
-msgstr "nu con�ine"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "a fost �nainte"
 
-#: filter/libfilter-i18n.h:37
-msgid "does not end with"
-msgstr "nu se termin� cu"
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "Reguli"
 
-#: filter/libfilter-i18n.h:38
-msgid "does not exist"
-msgstr "nu exist�"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Adaug� reguli"
 
-#: filter/libfilter-i18n.h:39
-msgid "does not sound like"
-msgstr "nu sun� ca"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Editez reguli"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not start with"
-msgstr "nu �ncepe cu"
+#: filter/score-editor.c:130
+msgid "Score Rules"
+msgstr "Reguli de punctaj"
 
-#: filter/libfilter-i18n.h:41
-msgid "ends with"
-msgstr "se termin� cu"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "exists"
-msgstr "exist�"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Import"
 
-#: filter/libfilter-i18n.h:43
-msgid "is greater than"
-msgstr "e mai mare dec�t"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Email"
 
-#: filter/libfilter-i18n.h:44
-msgid "is less than"
-msgstr "e mai mic dec�t"
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution a g�sit fi�iere de mail Elm.\n"
+"Dori�i s� le importa�i �n Evolution?"
 
-#: filter/libfilter-i18n.h:45
-msgid "is not"
-msgstr "nu este"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Mail Elm"
 
-#: filter/libfilter-i18n.h:46
-msgid "is"
-msgstr "este"
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Ad�ugare agend�"
 
-#: filter/libfilter-i18n.h:47
-msgid "on or after"
-msgstr "�n sau dup�"
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution a g�sit fi�iere de mail Netscape.\n"
+"Dori�i s� le importa�i �n Evolution?"
 
-#: filter/libfilter-i18n.h:48
-msgid "on or before"
-msgstr "�n sau �nainte"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Set�ri..."
 
-#: filter/libfilter-i18n.h:49
-msgid "sounds like"
-msgstr "sun� ca"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution a g�sit fi�iere de mail Netscape.\n"
+"Dori�i s� le importa�i �n Evolution?"
 
-#: filter/libfilter-i18n.h:50
-msgid "starts with"
-msgstr "�ncepe cu"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution a g�sit fi�iere de mail Pine.\n"
+"Dori�i s� le importa�i �n Evolution?"
 
-#: filter/libfilter-i18n.h:51
-msgid "was after"
-msgstr "a fost dup�"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Mail Pine"
 
-#: filter/libfilter-i18n.h:52
-msgid "was before"
-msgstr "a fost �nainte"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Component� Evolution pentru manipularea mailului."
 
-#: filter/rule-editor.c:142
-msgid "Rules"
-msgstr "Reguli"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: filter/rule-editor.c:235
-msgid "Add Rule"
-msgstr "Adaug� reguli"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Componenta Evolution pentru rezumatul activit��ilor."
 
-#: filter/rule-editor.c:293
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Componenta Evolution pentru afi�area mailului."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Componenta Evolution pentru procesarea mailului."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Procesator pentru compozitorul Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Procesator pentru componenta rezumat mail."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
-msgid "Edit Rule"
-msgstr "Editez reguli"
+msgid "Mail configuration interface"
+msgstr "Configurare mail"
 
-#: filter/score-editor.c:126
-msgid "Score Rules"
-msgstr "Reguli de punctaj"
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propriet��i..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modific� propriet��ile fi�ierului"
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:445
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:208
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-factory.c:210 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: mail/folder-browser.c:221
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nu pot crea directorul temporar: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Stochez c�utarea ca vFolder"
 
-#: mail/folder-browser.c:529
-msgid "VFolder on Subject"
-msgstr "VFolder �n subiect"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
+msgstr "VFolder pe _subiect"
 
-#: mail/folder-browser.c:532
-msgid "VFolder on Sender"
-msgstr "VFolder �n expeditor"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "VFolder pe expeditor"
 
-#: mail/folder-browser.c:535
-msgid "VFolder on Recipients"
-msgstr "VFolder �n destinatari"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Vfolder pe destinatari"
 
-#: mail/folder-browser.c:538 mail/folder-browser.c:729
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
 msgstr "VFolder �n lista de mail"
 
-#: mail/folder-browser.c:544
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:547
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:550
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:553 mail/folder-browser.c:728
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:564
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Retrimite"
 
-#: mail/folder-browser.c:566
-msgid "Save As..."
-msgstr "Salveaz� ca..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "_Salveaz� ca..."
 
-#: mail/folder-browser.c:568 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:29 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Tip�re�te"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "Ti_p�re�te"
 
-#: mail/folder-browser.c:573
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "R�spuns la expeditor"
 
-#: mail/folder-browser.c:575 mail/mail-view.c:141 ui/evolution-mail.xml.h:36
-msgid "Reply to All"
-msgstr "R�spuns la to�i" 
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "R�spuns la to�i"
 
-#: mail/folder-browser.c:577 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward"
-msgstr "�naintare"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "R�spuns la to�i"
 
-#: mail/folder-browser.c:579
-msgid "Forward inline"
-msgstr ""
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_�nainteaz�"
 
-#: mail/folder-browser.c:582
-msgid "Mark as Read"
-msgstr "Marchez ca citit"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr "Marcheaz� ca citit"
+
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr "Marcheaz� ca _necitit"
+
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Important"
 
-#: mail/folder-browser.c:584
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:589
-msgid "Move to Folder..."
-msgstr "Mut �n folderul..."
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "Mut� �n folder..."
 
-#: mail/folder-browser.c:591
-msgid "Copy to Folder..."
-msgstr "Copiez �n folderul..."
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copiaz� �n folderul..."
 
-#: mail/folder-browser.c:595
-msgid "Undelete"
-msgstr "Recuperare"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "Rec_uperare"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Ad�ugare agend�"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:609
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Creez regul� din mesaj"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtru pe lista de mail"
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr "VFolder �n lista de mail"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:732
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder pe lista de mail (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Component� Evolution pentru manipularea mailului."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Componenta Evolution pentru rezumatul activit��ilor."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Componenta Evolution pentru afi�area mailului."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Componenta Evolution pentru procesarea mailului."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import mbox into Evolution"
+msgstr "Procesator pentru importul mbox �n Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Procesator pentru compozitorul Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports mbox files into Evolution"
+msgstr "Import fi�ierele mbox �n Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Procesator pentru componenta de mail Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Procesator pentru importul mailurilor Outlook Express 4 �n Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Procesator pentru componenta rezumat mail."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Import fi�ierele Outlook Express 4 �n Evolution"
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5532,65 +6730,94 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:117
+#: 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 "Nu a�i completat toat� inform�ia ce vi s-a cerut."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de conturi Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr "Editor de conturi Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Fi�ier semn�tur�:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr "Dori�i s� salva�i modific�rile?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (implicit)"
 
-#: mail/mail-accounts.c:157
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Invalideaz�"
 
-#: mail/mail-accounts.c:159 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Valideaz�"
 
-#: mail/mail-accounts.c:240 mail/mail-accounts.c:244
+#: mail/mail-accounts.c:264
 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:369 mail/mail-accounts.c:373
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Recuperare"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "F� contul acesta contul meu implicit"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:487
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Manager de conturi Evolution"
 
-#: mail/mail-account-editor.c:98
-msgid "You have not filled in all of the required information."
-msgstr "Nu a�i completat toat� inform�ia ce vi s-a cerut."
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:166
-msgid "Evolution Account Editor"
-msgstr "Editor de conturi Evolution"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail la %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Adaug� regul� de filtrare"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5602,7 +6829,7 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "Dori�i s� face�i configurarea acum?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5610,7 +6837,7 @@ msgstr ""
 "Trebuie s� configura�i o identitate\n"
 "�nainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5618,11 +6845,11 @@ msgstr ""
 "Trebuie s� configura�i transportul mailurilor\n"
 "�nainte pentru a putea s� trimite�i mail. "
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Nu a�i setat o metod� de transport a mailului"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5630,32 +6857,46 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimite�i?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 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:351
+#: mail/mail-callbacks.c:410
 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"
+msgstr ""
+"Trebuie s� configura�i un cont �nainte pentru a putea s� trimite�i acest mail"
 
-#: mail/mail-callbacks.c:588
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
 msgstr "�n %s %s a scris:\n"
 
-#: mail/mail-callbacks.c:770
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mesaj �naintat:\n"
 
-#: mail/mail-callbacks.c:873
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mut� mesaj(e) �n"
 
-#: mail/mail-callbacks.c:875
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:1086
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Sunte�i sigur c� dori�� s� �terge�i task-ul `%s'?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5663,7 +6904,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n folderul Ciorne"
 
-#: mail/mail-callbacks.c:1117
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5671,44 +6912,101 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din folderul Trimise"
 
-#: mail/mail-callbacks.c:1150 mail/mail-display.c:86
-msgid "Overwrite file?"
-msgstr "Suprascrie�i fi�ierul?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Sunte�i sigur c� dori�� s� �terge�i task-ul `%s'?"
 
-#: mail/mail-callbacks.c:1154 mail/mail-display.c:90
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr "" 
-"Fi�ier al c�rui nume exist� deja.\n"
-"�l suprascrie�i?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Mesajul a fost recep�ionat"
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Salvez mesajul ca..."
 
-#: mail/mail-callbacks.c:1200
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Salvez mesaje ca..."
 
-#: mail/mail-callbacks.c:1314
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
-"%s" 
+"%s"
+
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:1363
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Tiparire mesaj"
 
-#: mail/mail-callbacks.c:1410
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: mail/mail-config.c:1012 mail/mail-config.c:1015
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"V� rog introduce�i numele �i adresa de email mai jos. C�mpurile "
+"\"op�ional\"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� "
+"include�i aceast� informa�ie �n emailul pe care-l trimite�i"
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"V� rog introduce�i mai jos informa�ii despre serverul de mail de "
+"intrare.Dac� nu �ti�i ce fel de server folosi�i, contacta�i "
+"administratoruldumneavoastr� de sistem sau furnizorul de serviciu Internet."
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"V� rog introduce�i mai jos informa�ii despre protocolul de mail de "
+"ie�ire.Dac� nu �ti�i ce protocol folosi�i, contacta�i "
+"administratoruldumneavostr� de sistem sau furnizorul de serviciu Internet."
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Aproape a�i terminat procesul de configurare a mailului. "
+"Identitatea,serverul de mail de intrare �i metoda de transport a a mailului "
+"ce le-a�iindicat vor fi grupate �mpreun� pentru a face un cont de mail "
+"Evolution. V�rog introduce�i mai jos un nume pentru acest cont. Acest nume "
+"va fifolosit doar pentru afi�are."
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Asistentul de conturi Evolution"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
@@ -5721,34 +7019,63 @@ msgid " color"
 msgstr " culoare"
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informa�ie cont"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Conturi"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Ata�"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Verific automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Compunere"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5765,163 +7092,280 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva set�rile"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Im_plicit"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Folder ciorne:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editez"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Valideaz�"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Fi�ier semn�tur�:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Ilumineaz� citatele cu "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_Inline"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nout��i"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Informa�ie op�ional�"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organiza�ie:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Cale binar� PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Alege o culoare"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Nu pot trimite mesajul: destinatar nedefinit."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Cotat"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Primire mail"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Op�iuni primire"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Informa�ie cerut�"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Securitate"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Selectez PGP binar"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Trimit implicit mail �n format HTML."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Trimitere mail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Trimis"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Trimitere �i mesaje ciorn�"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Folder mesaje trimise:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Serverul necesit� autentificare"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Fi�ier semn�tur�:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Surse"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Nici o informa�ie"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Surse"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Foldere speciale"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tip"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Folose�te conectare securizat� (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5931,207 +7375,241 @@ msgstr ""
 "\n"
 "Clic \"Urm�torul\" pentru a �ncepe"
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "_Editare"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config-druid.c:94
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
-"V� rog introduce�i numele �i adresa de email mai jos. C�mpurile \"op�ional\""
-"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� include�i "
-"aceast� informa�ie �n emailul pe care-l trimite�i"
 
-#: mail/mail-config-druid.c:96
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "secunde"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Nu m� pot conecta la serverul POP �n %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Nu m� pot conecta la serverul POP �n %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Nu pot crea fereastra de compunere."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
 msgstr ""
-"V� rog introduce�i mai jos informa�ii despre serverul de mail de intrare."
-"Dac� nu �ti�i ce fel de server folosi�i, contacta�i administratorul" 
-"dumneavoastr� de sistem sau furnizorul de serviciu Internet."
+"Nu pot crea directorul %s:\n"
+"%s"
 
-#: mail/mail-config-druid.c:100
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
 msgstr ""
-"V� rog introduce�i mai jos informa�ii despre protocolul de mail de ie�ire."
-"Dac� nu �ti�i ce protocol folosi�i, contacta�i administratorul"
-"dumneavostr� de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:102
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
-"Aproape a�i terminat procesul de configurare a mailului. Identitatea,"
-"serverul de mail de intrare �i metoda de transport a a mailului ce le-a�i"
-"indicat vor fi grupate �mpreun� pentru a face un cont de mail Evolution. V�"
-"rog introduce�i mai jos un nume pentru acest cont. Acest nume va fi"
-"folosit doar pentru afi�are."
 
-#. set window title
-#: mail/mail-config-druid.c:439
-msgid "Evolution Account Wizard"
-msgstr "Asistentul de conturi Evolution"
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
 
-#: mail/mail-display.c:192
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Nu pot crea fereastra de compunere."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Nu pot crea fereastra de compunere."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Salvez ata�"
 
-#: mail/mail-display.c:232
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nu pot crea directorul temporar: %s"
-
-#: mail/mail-display.c:293
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Salvez pe disc..."
 
-#: mail/mail-display.c:295
-#, c-format
-msgid "Open in %s..."
-msgstr "Deschid �n %s..."
-
-#: mail/mail-display.c:297
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:332
-msgid "External Viewer"
-msgstr "Vedere extern�"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Deschid �n %s..."
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:1080
-msgid "Open link in browser (FIXME)"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Vedere extern�"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "�nc�rcare con�inut mesaj"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Deschid link �n browser (FIXME)"
 
-#: mail/mail-display.c:1082
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Copiaz� loca�ia (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Salveaz� ca (FIXME)"
 
-#: mail/mail-display.c:1084
-msgid "Copy location (FIXME)"
-msgstr "Copiaz� loca�ia (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Salveaz� ca..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d secunde"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ata�"
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: mail/mail-format.c:736
-msgid "Loading message content"
-msgstr "�nc�rcare con�inut mesaj"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Adresa email:"
 
-#: mail/mail-format.c:1033
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De la"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "R�spuns la:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "La"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "Nu e disponibil nici un program GPG/PGP."
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mesaj criptat neafi�at"
 
-#: mail/mail-format.c:1039
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mesaj criptat"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Clic pe icon pentru decriptare."
 
-#: mail/mail-format.c:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1377
 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:1117 mail/mail-format.c:1504
+#: mail/mail-format.c:1388
 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:1717
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:1729
+#: mail/mail-format.c:2060
 #, 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:1733
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Indicator c�tre site-ul FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (\"%s\" type)"
 
-#: mail/mail-format.c:1772
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte a corpului mesajului extern� deformat�."
 
-#: mail/mail-local.c:336
-#, c-format
-msgid "No such folder %s"
-msgstr "Nu exist� folderul %s"
-
-#: mail/mail-local.c:508
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Deschid '%s'"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb folderul \"%s\" �n formatul \"%s\""
 
-#: mail/mail-local.c:790
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Schimb� folderul \"%s\" �n formatul \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Reconfigurez folderul"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "�nchid folderul curent"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Redenumesc vechiul folder �i schimb"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creez folder nou"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copiez mesaj"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6140,7 +7618,7 @@ msgstr ""
 "Nu pot salva informa�ia meta a folderului; probabil c� nu ve�i mai putea\n"
 "deschide acest folder: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6148,7 +7626,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-mt.c:181
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nu po�i copia mesaje din acest folder"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurez %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6157,99 +7645,114 @@ msgstr ""
 "Eroare �n timpul '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
-msgstr "Eroare �n timpul opera�iei:\n"
+msgstr ""
+"Eroare �n timpul opera�iei:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Lucrez"
 
-#: mail/mail-mt.c:670 mail/session.c:91
-msgid "Do you accept?"
-msgstr "Accepta�i?"
-
-#: mail/mail-mt.c:864
-msgid "Evolution progress"
-msgstr "Evolution progres"
-
-#: mail/mail-ops.c:593
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:597
-msgid "Sending message"
-msgstr "Trimit mesaj"
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Primesc mesajul %d din %d"
+
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "E�uare la mesajul %d din %d"
 
-#: mail/mail-ops.c:819
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+msgid "Complete."
+msgstr "Terminat"
+
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Salvez mesaj �n folder"
 
-#: mail/mail-ops.c:892
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesaje �n %s"
 
-#: mail/mail-ops.c:892
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesaje �n %s"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Mut"
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiez"
 
-#: mail/mail-ops.c:986
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez foldere �n \"%s\""
 
-#: mail/mail-ops.c:1144
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Gunoi"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-ops.c:1185 mail/mail-ops.c:1323
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid folder %s"
 
-#: mail/mail-ops.c:1252
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Deschid folder %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurez folderul"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Distru folder"
 
-#: mail/mail-ops.c:1488
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperez mesaj %s"
 
-#: mail/mail-ops.c:1555
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recuperez mesaje"
 
-#: mail/mail-ops.c:1565
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recuperez mesajul num�rul %s din %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1639
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Salvez mesaje"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6258,12 +7761,7 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1731
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvez mesajul %d din %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6272,11 +7770,11 @@ msgstr ""
 "Eroare �n timpul salv�rii mesajului la: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1819
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Salvez ata�"
 
-#: mail/mail-ops.c:1834
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6285,238 +7783,196 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_Caut�"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(F�r� titlu)"
 
-#: mail/mail-send-recv.c:136
-msgid "Cancelling ..."
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mesaje multiple"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Mesaj"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Trimit mesaj"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "�naintare"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "G�se�te"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Cale:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Renun�..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Trimite & Prime�te mail"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Primesc"
 
-#: mail/mail-send-recv.c:283
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "A�tept..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Trimit"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Terminat"
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "Mesaj scris incomplet �n conduct�!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nu pot crea temporar mbox `%s': %s"
 
-#: mail/mail-tools.c:185
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mesaj �naintat)"
-
-#: mail/mail-tools.c:195
-msgid "Fwd: (no subject)"
-msgstr "�nainte: (no subject)"
-
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesaj �naintat - %s"
 
-#: mail/mail-tools.c:214
-msgid "Forwarded message (no subject)"
-msgstr "Mesaj �naintat (no subject)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mesaje �naintate"
 
-#: mail/mail-tools.c:411
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mesaj �naintat-----<br><b>De la:</b> %s<br><b>La:</b> "
-"%s<br><b>Subiect:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mesaje �naintate"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFoldere"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "VFolder Nou"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:35
-msgid "Reply"
-msgstr "R�spuns"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:39
-msgid "Reply to the sender of this message"
-msgstr "R�spuns la expeditorul acestui mesaj"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:38
-msgid "Reply to all recipients of this message"
-msgstr "R�spuns la to�i destinatarii acestui mesaj"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
-msgid "Forward this message"
-msgstr "�naintez acest mesaj"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:32
-msgid "Print the selected message"
-msgstr "Tip�resc mesajul selectat"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "�terg acest mesaj"
-
-#: mail/message-list.c:650
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Sc�zut�"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Mare"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Mai mare"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:952
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1050
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Salvez mesaje"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcat"
 
-#: mail/message-list.c:1051
-msgid "From"
-msgstr "De la"
-
-#: mail/message-list.c:1051
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1051
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Primit"
 
-#: mail/message-list.c:1052
-msgid "To"
-msgstr "La"
-
-#: mail/message-list.c:1052
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "M�rime"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "V� rog introduce�i %s fraza de trecere pentru %s"
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "V� rog introduce�i fraza de trecere %s"
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:763
-#: mail/openpgp-utils.c:917 mail/openpgp-utils.c:1076
-#, fuzzy
-msgid "No GPG/PGP program available."
-msgstr "Nu e disponibil nici un program GPG/PGP."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:770
-#: mail/openpgp-utils.c:924
-msgid "No password provided."
-msgstr "Nici o parol� dat�."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:776
-#: mail/openpgp-utils.c:932 mail/openpgp-utils.c:1082
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nu pot crea conducta la PGP/GPG: %s"
-
-#: mail/openpgp-utils.c:592
-msgid "No recipients specified"
-msgstr "Nici un destinatar specificat"
-
-#: mail/openpgp-utils.c:1093
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nu pot crea fi�ier temp: %s"
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Folder"
 
@@ -6544,209 +8000,1449 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscriu de la folderul \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Administrare subscrieri"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Componenta Evolution pentru rezumatul activit��ilor."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Procesator pentru componenta rezumat al activit��ilor."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Nu pot ini�ializa componenta Evolution pentru rezumatul activit��ilor."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Factory to import mbox into Evolution"
-msgstr "Procesator pentru importul mbox �n Evolution"
+msgid "Appointments"
+msgstr "�nt�lnire"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#: my-evolution/e-summary-calendar.c:177
 #, fuzzy
-msgid "Imports mbox files into Evolution"
-msgstr "Import fi�ierele mbox �n Evolution"
+msgid "No appointments"
+msgstr "Arat� �nt�lnirile"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: my-evolution/e-summary-calendar.c:226
 #, fuzzy
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Procesator pentru importul mailurilor Outlook Express 4 �n Evolution"
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#: my-evolution/e-summary-calendar.c:228
 #, fuzzy
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Import fi�ierele Outlook Express 4 �n Evolution"
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
 
-#: mail/importers/elm-importer.c:416
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Nu exist� rezumat"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
-"Evolution a g�sit fi�iere de mail Elm.\n"
-"Dori�i s� le importa�i �n Evolution?"
 
-#: mail/importers/elm-importer.c:426
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
 #, fuzzy
-msgid "Elm mail"
-msgstr "Mail Elm"
+msgid "My Evolution Settings"
+msgstr "Instalare Evolution"
 
-#: mail/importers/netscape-importer.c:441
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "A fost o eroare la �nc�rcarea calendarului."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Eroare la �nc�rcarea calendarului</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Arat� task-uri"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
-"Evolution a g�sit fi�iere de mail Netscape.\n"
-"Dori�i s� le importa�i �n Evolution?"
 
-#: mail/importers/pine-importer.c:381
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"Evolution a g�sit fi�iere de mail Pine.\n"
-"Dori�i s� le importa�i �n Evolution?"
 
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sec�iuni"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: mail/importers/pine-importer.c:391
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Pine mail"
-msgstr "Mail Pine"
+msgid "Print My Evolution"
+msgstr "Evolution"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nume folder:"
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Tip�rirea mesajului nereu�it�"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Tip folder:"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Preciza�i unde s� fie creat folderul:"
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "�terge"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:167
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
-"Import %s\n"
-"Import neterminat.\n"
-"A�tepta�i 5 secunde s� �ncerc din nou."
 
-#: shell/importer/importer.c:187 shell/importer/importer.c:218
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
 msgstr ""
-"Import %s\n"
-"Import articol %d." 
 
-#: shell/importer/importer.c:326
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
 msgstr ""
-"Nu se reu�e�te importul\n"
-"%s"
 
-#: shell/importer/importer.c:336
-msgid "Importing"
-msgstr "Import"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:344
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
 msgstr ""
-"Import %s.\n"
-"Start %s"
 
-#: shell/importer/importer.c:357
-#, c-format
-msgid "Error starting %s"
-msgstr "Eroare start %s"
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Invalideaz�"
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error loading %s"
-msgstr "Eroare la �nc�rcarea %s"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Not�"
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
-"Import %s\n"
-"Import item 1."
 
-#: shell/importer/importer.c:458
-msgid "Automatic"
-msgstr "Automat"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_ti�e"
 
-#: shell/importer/importer.c:508
-msgid "Filename:"
-msgstr "Nume fi�ier:"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:513
-msgid "Select a file"
-msgstr "Selectez un fi�ier"
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Exist�"
 
-#: shell/importer/importer.c:523
-msgid "File type:"
-msgstr "Tip fi�ier:"
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:604
-msgid "Import"
-msgstr "Import"
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Surse"
 
-#: shell/importer/importer.c:639
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "lun�"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Mai sc�zut�"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Mai sc�zut�"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Arat�"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "G�se�te din nou"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "acum"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualizez acum"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Email"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Arat� un dialog"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Email principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Primire mail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Eroare necunoscut�"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Invita�ii �nt�lnire"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "D-ra."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portret"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Lista de mail"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "�nchide aceast� fereastr�"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Punctaj"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Arat� task-uri"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "�nchide aceast� fereastr�"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Trimit"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cap"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "zile"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "August"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "R�spuns"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Foldere"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "To�i participan�ii"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Afi�eaz� folderele �ncep�nd cu:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Op�iuni afi�are"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Afi�eaza"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Vineri"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Miercuri"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "lun�"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 s�pt�m�n�"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Program\n"
+"Ora"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Arat� task-uri"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "cu toate foldere distante active"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Arat� task-uri"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Sarcini"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
 msgstr ""
-"Alege�i fi�ierul ce dori�i s�-l importa�i �n Evolution �i selecta�i ce tip " 
-"de fi�ier este din list�.\n"
 "\n"
-"Pute�i selecta \"Automat\" dac� nu �ti�i tipul �i Evolution va �ncerca s�-l "
-"determine automat."
+"  Unitate:"
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Da�i clic pe \"Import\" pentru  �ncepe importul �n Evolution. "
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Alte"
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Utilitate de import Evolution"
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "�terge selec�ia"
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Utilitar de import Evolution"
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Aprilie"
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
 msgstr ""
-"Bine a�i venit la utilitatea de import Evolution.\n"
-"Cu acest asistent ve�i fi ghidat prin procesul de\n"
-"import al fi�ierelor extene �n Evolution."
 
-#: shell/importer/intelligent.c:109
-msgid "Import files"
-msgstr "Import fi�iere"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Shell Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalii"
 
-#: shell/importer/intelligent.c:122
-msgid "Don't ask me again"
-msgstr "Nu m� �ntreba din nou"
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Anulare �nt�lnire"
 
-#: shell/e-setup.c:114 shell/e-setup.c:187
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Foldere speciale"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalare Evolution"
 
-#: shell/e-setup.c:118
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6754,27 +9450,25 @@ msgstr ""
 "Acest� versiune de Evolution are nevoie s� instaleze fi�iere �n plus\n"
 "�n directorul dumneavoastr� personal"
 
-#: shell/e-setup.c:119
+#: shell/e-setup.c:130
 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"
+msgstr ""
+"V� rog s� da�i clic pe \"OK\" pentru a instala fi�ierele, sau \"Renun��\" "
+"pentru ie�ire"
 
-#: shell/e-setup.c:159
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: shell/e-setup.c:162 shell/e-setup.c:230
-msgid "Evolution files successfully installed."
-msgstr "Fi�ierele Evolution au fost instalate cu succes."
-
-#: shell/e-setup.c:191
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Pare a fi prima dat� c�nd rula�i Evolution."
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "V� rog s� da�i clic pe \"OK\" pentru a instala fi�ierle Evolution"
 
-#: shell/e-setup.c:211
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6785,16 +9479,14 @@ msgstr ""
 "%s\n"
 "Eroare: %s"
 
-#: shell/e-setup.c:226
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Nu pot copia fi�ierele �n\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "A ap�rut o eroare �n timpul citirii fi�ierului."
 
-#: shell/e-setup.c:251
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6805,7 +9497,16 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator Evolution."
 
-#: shell/e-setup.c:263
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6816,7 +9517,58 @@ msgstr ""
 "V� rog s�-l muta�i pentru a permite instalarea\n"
 "fi�ierelor utilizator Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Nu pot g�si folderul: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Nu pot copia fi�ierele �n\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copiaz� �n folder"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mut� in folder"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "�tergere dup� %s zi(le)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Sunte�i sigur c� dori�� s� �terge�i task-ul `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Deschid folder %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6825,15 +9577,15 @@ msgstr ""
 "Nu pot crea folderul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Numele folderului specificat este invalid."
 
-#: shell/e-shell-folder-creation-dialog.c:260
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Creare folder nou"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -6841,27 +9593,133 @@ msgstr ""
 "Tipul fi�ierului selectat nu e valid pentru\n"
 "opera�ia cerut�."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(F�r� titlu)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Alege�i fi�ierul ce dori�i s�-l importa�i �n Evolution �i selecta�i ce tip "
+"de fi�ier este din list�.\n"
+"\n"
+"Pute�i selecta \"Automat\" dac� nu �ti�i tipul �i Evolution va �ncerca s�-l "
+"determine automat."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Import %s\n"
+"Import neterminat.\n"
+"A�tepta�i 5 secunde s� �ncerc din nou."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Import %s\n"
+"Import articol %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Nu se reu�e�te importul\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Import"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Import %s.\n"
+"Start %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Eroare start %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Import %s\n"
+"Import item 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automat"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nume fi�ier:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Selectez un fi�ier"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tip fi�ier:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Alege folderul"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 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:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6871,30 +9729,71 @@ msgstr ""
 "pentru mail, calendar �i managementul contactelor\n"
 "�n mediul desktop GNOME"
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Mergi la folder..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Creaz� un grup nou de scurt�turi"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Lucreaz� offline"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "Lucreaz� offline"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nici un folder afi�at)"
 
-#: shell/e-shell-view.c:1129
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution - %s"
 
-#: shell/e-shell-view.c:1131
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea local� -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6903,15 +9802,15 @@ msgstr ""
 "Ooops! Vizualizarea pentru `%s' a murit nea�teptat. :-(\n"
 "Aceasta �nseamn� c� probabil componenta %s a cr�pat."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Creaz� grup nou de scurt�turi"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nume grup:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6920,148 +9819,271 @@ msgstr ""
 "Chiar dori�i s� �nl�tura�i grupul\n"
 "`%s' din bara de scurt�turi?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Nu �nl�tura"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "�nl�tur� acest grup de scurt�turi"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "�nl�tur� acest grup de scurt�turi"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icoane _mici"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Arat� scurt�turile ca icoane mici"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Icoane m_ari"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Arat� scurt�turile ca icoane mari"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi"
 
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "�nl�tur� acest grup..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "�nl�tur� acest grup..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "�nl�tur� acest grup de scurt�turi"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activeaz�"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activeaz� aceast� scurt�tur�"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Deschide"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nume regul�:"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "�nl�tur� acest grup de scurt�turi"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�nl�tur� aceast� aceast� scurt�tur� din bara de scurt�turi"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvare scurt�turi."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vizualizare"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Scurt�tur�"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Vizualizeaz� folderul selectat"
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contact"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(F�r� nume)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Eroare generic�"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un folder cu acela�i nume"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Tipul de folder specificat nu e valid"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea folderul"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Folderul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Acces interzis"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Shell Evolution."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/main.c:75
-#, no-c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_let:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Orice c�mp con�ine"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Gazd�:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nume folder:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Tip folder:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Preciza�i unde s� fie creat folderul:"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Da�i clic pe \"Import\" pentru  �ncepe importul �n Evolution. "
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Utilitate de import Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Utilitar de import Evolution"
+
+#: shell/importer/import.glade.h:6
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Bine a�i venit la utilitatea de import Evolution.\n"
+"Cu acest asistent ve�i fi ghidat prin procesul de\n"
+"import al fi�ierelor extene �n Evolution."
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Import"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Nu �nl�tura"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Nu m� �ntreba din nou"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
+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"
@@ -7071,259 +10093,338 @@ msgstr "Salut. Mul�umesc pentru timpul acordat pentru desc�rcarea acestui\n"
 "Sper�m c� Evolution v� va fi folositor, dar trebuie totu�i s� v� avertiz�m\n"
 "c� poate: cr�pa, pierde mesaje, l�sa procese r�t�cite in rulare, consuma\n"
 "100% CPU, trimite mesaje de eroare la servere, �i �n general v� poate pune\n"
-"�n situa�ii st�njenitoare �n fa�a prietenilor �i colegilor. Folosi�i-l numai\n"
+"�n situa�ii st�njenitoare �n fa�a prietenilor �i colegilor. Folosi�i-l "
+"numai\n"
 "conform instruc�iunilor.\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:100
+
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
-msgstr "V� mul�umim\n"
+msgstr ""
+"V� mul�umim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:131
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Nu pot ini�ilaiza shell-ul Evolution."
 
-#: shell/main.c:177
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Invalideaz� ecran splash"
 
-#: shell/main.c:178
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Trimite ie�irile de debugg ale tuturor componentelor �ntr-un fi�ier."
 
-#: shell/main.c:211
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot ini�ializa sistemul de componente Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiaz�"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copiaz� selec�ia"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Creaz� contact nou"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "�terge un contact"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Creaz� contact nou"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "G�se�te"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Taie"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "G�se�te un contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Taie selec�ia"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "�terge un contact"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Contact nou"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
-msgid "Previews the message to be printed"
-msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Nout��i"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Lipe�te"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Lipe�te clipboard-ul"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Previzualizeaz� calendar ce va fi tip�rit"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Tip�re�te contacte"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Selecteaz� tot"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "�terge un contact"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Opre�te �nc�rcarea"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Vizualizeaz� tot"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Vizualizeaz� toate contactele"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Surse _agend�..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contact"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Tip�re�te..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Caut� contacte"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Selecteaz� tot"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Unelte"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 zile"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Modific� preferin�e"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Creaz� un eveniment nou"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Creaz� o �nt�lnire nou�"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Creaz� calendar nou"
+msgid "Create a new appointment"
+msgstr "Creaz� o �nt�lnire nou�"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Zi"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Mergi �napoi �n timp"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Mergi �nainte �n timp"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Mergi la _data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Mergi la _ziua"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Mergi la o anumit� data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Mergi la timpul prezent"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Luna"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "_Eveniment nou"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Urm�torul"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Deschide calendar"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Prev"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "�nt�lnire nou�"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Previzualizeaz� calendar ce va fi tip�rit"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Tip�re�te calendar"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Tip�re�te acest calendar"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Salveaz� ca"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Informa�ie cerut�"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Salveaz� calendarul ca altceva"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Arat� 1 zi"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Arat� 1 lun�"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Arat� 1 s�pt�m�n�"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Arat� s�pt�m�na de lucru"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Ast�zi"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_S�pt�m�na de lucru"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "S�pt�m�n�"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_�nt�lnire"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Set�ri _mail..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Zi"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Lun�"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nou"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr "_S�pt�m�n�"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Deschide calendar"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "�nchide"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Salveaz� ca..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "�nchide aceast� �nt�lnire"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
-msgstr "_S�pt�m�n�"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "�terge aceast� �nt�lnire"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Bara de unelte principal�"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Previzualizeaz� tip�rire"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Seteaz� tip�rire"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Tip�re�te acest articol"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Tip�re�te"
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Salveaz� �i �nchide"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Salveaz� �nt�lnirea �i �nchide c�su�a de dialog"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Schimb� vederea cu %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Set�ri de pagin� pentru imprimanta curent�"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Ac�iuni"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fi�ier"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "�terge acest articol"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "�terge..."
 
@@ -7335,27 +10436,12 @@ msgstr "Ajutor"
 msgid "Print En_velope..."
 msgstr "Tip�re�te plic..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Tip�re�te acest articol"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Tip�re�te"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "S_alvez� ca..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Salveaz� �i �nchide"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Salveaz� contact �i �nchide c�su�a de dialog"
@@ -7372,800 +10458,1000 @@ msgstr "Vezi ajutor online"
 msgid "Send _message to contact..."
 msgstr "Trimite _mesaj c�tre contact..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "_Fi�ier"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salveaz�"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Despre aceast� aplica�ie"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "�terge acest articol"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Despre..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Salveaz� task �i �nchide c�su�a de dialog"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ac�iu_ni"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Trimite co_ntact la altcineva..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Agenda... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Trimite _mesaj c�tre contact..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "�terge"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Anulare �nt�lnire"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Taie"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Verific� nume (FIXME)"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "�naintez ca v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "�terge"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "�naintez acest mesaj"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "�terge selec�ia"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "�nchide aceast� �nt�lnire"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Cerere\n"
+"�nt�lnire"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Copiaz� �n folder... (FIXME)"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Progra_mare �nt�lniri"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copiaz�"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Programare �nt�lniri"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copiaz� selec�ia"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Ac�iuni"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Taie"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution - %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Taie selec�ia"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Anulat"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "�terge aceast� �nt�lnire"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Salveaz� fi�ierul curent"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Descarc� XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Compunere"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Descarc� descrierea UI Xml"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Compune un mesaj nou"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Primul articol din folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "�nainteaz� (FIXME)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "�naintez ca v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Mergi la articolul urm�tor"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Gole�_te gunoiul"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Mergi la articolul anterior"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Uit� _parolele"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Task in_comlete (FIXME)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modific� propriet��ile fi�ierului"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Administrare _subscrieri..."
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Urm�torul"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Lipe�te"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Lipe�te clipboard-ul"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Trimitere / Primire"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Anterior"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Trimit mailurile din coad� �i descarc mailurile noi"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Anterior"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Previzualizeaz� tip�rire"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Seteaz� tip�rire..."
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor folder virtual..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Seteaz� tip�rire"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtre..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:236
-msgid "Save"
-msgstr "Salvare"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Mesaj _mail"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Salveaz� �nt�lnirea �i �nchide c�su�a de dialog"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Set�ri _mail..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Salveaz� fi�ierul curent"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Previzualizare"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Progra_mare �nt�lniri"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "Trimit / Prime_sc"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Programeaz� ceva ce seam�n� cu o �nt�lnire"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Selecteaz� tot"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Ascunde mesajele selectate"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Selecteaz� tot"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Tip�resc mesajul selectat"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Set�ri de pagin� pentru imprimanta curent�"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Ascunde mesajele selectate"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Ce_rere task (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Ascunde mesajele �terse"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Despre..."
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Ascunde mesajele citite"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
-msgstr "�n_chide"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Marcheaz� tot ca citit"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copiaz�"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Marcheaz� mesajele ca \"Citit\" dup�:"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Debug"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Lipe�te clipboard-ul"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "Ajutor"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Nu po�i copia mesaje din acest folder"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Art_icol (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Selecteaz� tot"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Intrare _jurnal (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Selec_teaz� fir"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "U_ltimul articol din folder (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Mesaj mail (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mut� �n folder... (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "�terg acest mesaj"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Not� (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "_Arat� tot"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Lipe�te"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Ti_p�re�te"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Propriet��i..."
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Tip�resc mesajul selectat"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Selecteaz� tot"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "List� de mesaje �nl�n�uite"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Task (FIXME)"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "Distrug_e"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "Articol necitit (FIXME)"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Folder"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Adaug serviciu"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverseaz� selec�ia"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Adaug un serviciu nou la Executive Summary"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propriet��i..."
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Creez un mail nou"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "List� de mesaje �nl�n�uite"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Set�ri pentru Executive Summary..."
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Tip�resc mesajul selectat"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Mail nou"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "R�spuns la to�i destinatarii acestui mesaj"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Compunere"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Compune un mesaj nou"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "R�spuns la expeditorul acestui mesaj"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
 msgstr "Copiaz� mesajul �ntr-un folder nou"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Creez folder virtual din mesaj"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "R�spuns la expeditorul acestui mesaj"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "Afi�eaz� toate antetele mesajului"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Empty _Trash"
-msgstr "Gole�_te gunoiul"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Tip�resc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "�terg acest mesaj"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "Filtru pe lista de mail"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtru pe expeditor"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filt_ru pe destinatar"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtru pe _subiect"
 
-#: ui/evolution-mail.xml.h:13
-msgid "Forget _Passwords"
-msgstr "Uit� _parolele"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "�naintare"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "�nainteaz� ca"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Full _Headers"
-msgstr "Toate antetele"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "�nainteaz� ca"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide Deleted Messages"
-msgstr "Ascunde mesajele �terse"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "�nainteaz� ca"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Hide S_elected Messages"
-msgstr "Ascunde mesajele selectate"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "�nainteaz� ca"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Hide _Deleted Messages"
-msgstr "Ascunde mesajele �terse"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Hide _Read messages"
-msgstr "Ascunde mesajele citite"
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Manage _Subscriptions..."
-msgstr "Administrare _subscrieri..."
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Tip�resc mesajul selectat"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mar_k as Read"
-msgstr "Marcheaz� ca citit"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Mark All as R_ead"
-msgstr "Marcheaz� tot ca citit"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mesaje �naintate"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Mark as U_nread"
-msgstr "Marcheaz� ca _necitit"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Important"
+
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Marchez ca necitit"
+
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Tip�resc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Tip�resc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Tip�resc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Tip�resc mesajul selectat"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mut�"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "Mut� mesajele �ntr-un folder nou"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Print message to the printer"
-msgstr "Tip�re�te mesaj la imprimant�"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redirectare (FIXME: de implementat)"
-
-#: ui/evolution-mail.xml.h:37
-msgid "Reply to _All"
-msgstr "R�spuns la to�i"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Urm�torul"
 
-#: ui/evolution-mail.xml.h:40
-msgid "S_ource"
-msgstr "Sursa"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "R�spuns la expeditorul acestui mesaj"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Selecteaz� tot"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Mesaj"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Select _Thread"
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
 msgstr "Selec_teaz� fir"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Send / Receive"
-msgstr "Trimitere / Primire"
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Mesaje multiple"
 
-#: ui/evolution-mail.xml.h:44
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "Tip�resc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
-"Trimit mailurile din coad�\n"
-"    �i primesc mailurile noi"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send queued mail and retrieve new mail"
-msgstr "Trimit mailurile din coad� �i descarc mailurile noi"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Show _All"
-msgstr "_Arat� tot"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Threaded Message list"
-msgstr "List� de mesaje �nl�n�uite"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:50
-msgid "VFolder on Se_nder"
-msgstr "VFolder pe expeditor"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:51
-msgid "VFolder on _Recipients"
-msgstr "Vfolder pe destinatari"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:52
-msgid "VFolder on _Subject"
-msgstr "VFolder pe _subiect"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:53
-msgid "View Raw Message Source"
-msgstr "Vizualizare surs� mesaj"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Previzualizare tip�rire"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor folder virtual..."
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Apply Filters"
-msgstr "_Aplic� filtrele"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "R�spuns"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Attachment"
-msgstr "_Ata�"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "R�spuns la to�i"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "_Compose"
-msgstr "_Compunere"
+msgid "S_earch Message"
+msgstr "Mesaj server:"
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Copy to Folder..."
-msgstr "_Copiaz� �n folderul..."
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Salvez mesajul �ntr-un folder specificat"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Create Filter From Message"
-msgstr "_Creaz� filtru din mesaj"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Expunge"
-msgstr "Distrug_e"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Filters..."
-msgstr "_Filtre..."
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "Toate antetele"
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Folder"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Ora trebuie s� fie �n formatul: %s"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Forward"
-msgstr "_�nainteaz�"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Verific mesajele noi �n toate folderele"
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Inline"
-msgstr "_Inline"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Ata�ez� un fi�ier la mesaj"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverseaz� selec�ia"
+#: ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Tip�resc mesajul selectat"
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Mail Message"
-msgstr "Mesaj _mail"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "VFolder �n lista de mail"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_Mail Settings..."
-msgstr "Set�ri _mail..."
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "VFolder pe expeditor"
 
-#: ui/evolution-mail.xml.h:69
-msgid "_Move to Folder..."
-msgstr "Mut� �n folder..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Vfolder pe destinatari"
 
-#: ui/evolution-mail.xml.h:70
-msgid "_Open Selected Items"
-msgstr "_Deschide articolele selectate"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "VFolder pe _subiect"
 
-#: ui/evolution-mail.xml.h:72
-msgid "_Quoted"
-msgstr "Cotat"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
+msgstr "_Aplic� filtrele"
+
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copiaz� �n folder"
 
-#: ui/evolution-mail.xml.h:73
-msgid "_Reply"
-msgstr "_R�spuns"
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
+msgstr "_Creaz� filtru din mesaj"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Resend Messages"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Mesaje �naintate"
+
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Mesaje"
+
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Mut� in folder"
+
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Afi�eaza"
+
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
 msgstr "_Retrimit mesaje"
 
-#: ui/evolution-mail.xml.h:76
-msgid "_Send / Receive"
-msgstr "Trimit / Prime_sc"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "_Retrimit mesaje"
 
-#: ui/evolution-mail.xml.h:77
-msgid "_Threaded"
-msgstr "_�nl�n�uite"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "�nchide aceast� fereastr�"
 
-#: ui/evolution-mail.xml.h:79
-msgid "_Undelete"
-msgstr "Rec_uperare"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zeaz� bara de unelte..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizare"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizeaz� bara de unelte"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "�n_chide"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vizualizare"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ata�eaz�"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "�nchid fi�ierul curent"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "�terge un contact"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Cripteaz� acest mesaj cu PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Insereaz� fi�ier text..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Insereaz� un fi�ier ca text �n mesaj"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Insereaz� fi�ier text..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Deschide fi�ier"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Semn�tur� PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Salvez ciorna"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Criptare PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salvez �n _folder... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Salvare"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Salveaz� ca"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Salvez ciorna"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Salvez �n folder..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Salveaz� fi�ierul curent"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Salvez fi�ierul curent cu un nume diferit"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salvez mesajul �ntr-un folder specificat"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Trimit"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Trimit mai t�rziu"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Trimit mai t�rziu"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Trimit mailul �n format HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Trimit mesajul mai t�rziu"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Trimit un mesaj nou"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Trimit acest mesaj acum"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Arat� / ascunde ata�urile"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Arat� _ata�urile"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Arat� ata�urile"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Semna�i acest mesaj cu cheia dumneavoastr� PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Semna�i acest mesaj cu cheia dumneavoastr� PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Selecteaz� �n timp ce c�mpul BCC e afi�at "
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Selecteaz� �n timp ce c�mpul CC e afi�at"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Selecteaz� �n timp ce c�su�a De la e afi�at�"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Selecteaz� �n timp ce c�mpul R�spuns la e afi�at"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Ata�"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "C�mpul _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "C�mpul _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_�tergere"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "C�mpul De la"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insereaz�"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insereaz� fi�ier text... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "Deschide..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "C�mpul _R�spuns la"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Securitate"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Ajutor"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Adaug� folderul la lista folderelor subscrise"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "F_older"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Re�mprosp�teaz� lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Re�mprosp�teaz� lista folderelor"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "�terge folderul din lista folderelor subscrise"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscrie"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Desubscrie"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Atribuie task (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "G�se�te din nou"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Cerere de �nt�lnire (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Repetare"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Repet� ac�iunea neefectuat�"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "�nlocuie�te"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "�nlocuie�te un �ir"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "R�spuns la to�i (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Trimit_e raportul de stare (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Sari peste apari�ie (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Salveaz� task �i �nchide c�su�a de dialog"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Caut� din nou acela�i �ir"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Caut� un �ir"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Refacere"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Task nou"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Ref� ultima ac�iune"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "�tergere task"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_�nt�lnire (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Re�mprosp�teaz� lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcare complet�"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_R�spuns (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_Deschide articolele selectate"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Creaz� un task nou�"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "�tergere task"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "�tergere task"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Task nou"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Lipe�te clipboard-ul"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Salveaz� task-ul ca altceva"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferin�e task..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Set�ri _mail..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Task"
 
@@ -8173,132 +11459,217 @@ msgstr "_Task"
 msgid "About Evolution..."
 msgstr "Despre Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "�nchide aceast� fereastr�"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zeaz� bara de unelte..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Bara cu _scurt�turi"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizare"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Schimb� vederea cu %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizeaz� bara de unelte"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copiaz� �n folder"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creez folder nou"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "�nl�tur� aceast� aceast� scurt�tur� din bara de scurt�turi"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creez folder nou"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "�terge acest articol"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Afi�eaz� un folder diferit"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Ie�ire"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Fereastra Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Ie�ire din program"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Ghid de ini�iere"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Import� in format de fi�ier extern"
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Bara de unelte principal�"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mut� %s la st�nga"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
+msgstr ""
+
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Arat� informa�ii despre Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Raporteaz� un bug"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Raporteaz� un bug"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Raporteaz� un bug folosind Bug Buddy"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Rol"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Selecteaz� �n timp ce ar�t bara folder"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Selecteaz� �n timp ce ar�t bara cu scurt�turi"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Selecteaz� �n timp ce c�su�a De la e afi�at�"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Ghid de utilizare a managerului de contacte"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Ghid de utilizare a calendarului"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Ghid de utilizare a programului de mail"
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr "Lucreaz� offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Vizualizeaz� folderul selectat"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Despre Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "_Ac�iuni"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_�nt�lnire (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contact (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiaz�"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Bara _folder"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Mer_gi la folderul..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Import fi�ier..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Mesaj _mail"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mut�"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nou"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Folder _nou"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "Deschide..."
+
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_Scurt�tur�"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Task (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Lucreaz� offline"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Set�ri _mail..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Carduri adres�"
 
 #: views/addressbook/galview.xml.h:2
@@ -8331,157 +11702,243 @@ msgstr "Cu categorie"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:466
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2472
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Tentative"
-msgstr "Tentativ�"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Afar� din oficiu"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Nici o informa�ie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:406
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invit� pe al�ii..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:426
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Op�iuni"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:443
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Arat� numai _orele de lucru"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:456
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Arat� m�rit"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:474
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "Act_ualizeaz� liber/ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:492
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:509
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:523
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:540
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "To_ate persoanele �i resursele"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:553
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Toate _persoanele �i o resurs�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:566
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Necesa_r o persoan�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:579
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Necesar o persoan� �i _o resurs�"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:602
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Ora de �nceput a �nt�lnirii:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:626
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:739
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "To�i participan�ii"
 
-#: widgets/menus/gal-view-menus.c:175
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Vizualizarea _curent�"
 
-#: widgets/menus/gal-view-menus.c:194
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Definire vizualizare"
 
 #. 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:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Acum"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Ast�zi"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ora trebuie s� fie �n formatul: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "s�pt�m�n�"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Gunoi"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Tranzac�ie e�uat�"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Nout��i"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Eroare necunoscut�: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Alte"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:163
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contacte"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "C�utare avansat�"
 
-#: widgets/misc/e-filter-bar.c:314
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Afi�eaz� tot"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "Avansat..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informa�ie"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertisment"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Eroare"
+
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "�ntrebare"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "Mesaj"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Nu ar�ta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_C�utare"
 
@@ -8505,57 +11962,599 @@ msgstr "init_corba(): nu pot ini�ializa GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
-#~ msgid "Send contact to other"
-#~ msgstr "Trimite contact la altcineva"
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Modific� preferin�e"
 
-#~ msgid "Send message to contact"
-#~ msgstr "Trimite mesaj la contact"
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferin�e task..."
 
-#~ msgid "Print Envelope"
-#~ msgstr "Tip�re�te plic"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacte..."
 
-#~ msgid "File As"
-#~ msgstr "Fi�ier ca"
+#~ msgid "_Company:"
+#~ msgstr "_Compania:"
 
-#~ msgid "Primary Phone"
-#~ msgstr "Telefon principal"
+#~ msgid "As _Minicards"
+#~ msgstr "Ca Minicard"
 
-#~ msgid "Assistant Phone"
-#~ msgstr "Telefon asistent"
+#~ msgid "As _Table"
+#~ msgstr "Ca tabel"
 
-#~ msgid "Company Phone"
-#~ msgstr "Telefon companie"
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Nu pot deschide agenda. Aceasta inseamn�\n"
+#~ "c� a�i introdus URI incorect sau a�i �ncercat\n"
+#~ "s� accesa�i un server LDAP �i nu ave�i compilat suport pentru acesta.\n"
+#~ "Dac� a�i introdus URI, verifica�i corectitudinea si reintroduce�i.\n"
+#~ "Dac� nu, probabil a�i �ncercat s� accesa�i un server LDAP.\n"
+#~ "Dac� dori�i s� folosi�i LDAP, trebuie s� desc�rca�i �i s�\n"
+#~ "instala�i OpenLDAP �i s� recompila�i �i instala�i Evolution.\n"
 
-#~ msgid "Home Phone"
-#~ msgstr "Telefon acas�"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-#~ msgid "Home Address"
-#~ msgstr "Adresa acas�"
+#~ msgid "Find..."
+#~ msgstr "G�se�te..."
 
-#~ msgid "Mobile Phone"
-#~ msgstr "Telefon mobil"
+#, fuzzy
+#~ msgid "Click here to add a contact"
+#~ msgstr "* Click aici s� ad�uga�i un contact *"
 
-#~ msgid "Car Phone"
-#~ msgstr "Telefon ma�in�"
+#~ msgid "Open calendar"
+#~ msgstr "Deschide calendar"
 
-#~ msgid "Home Phone 2"
-#~ msgstr "Telefon acas� 2"
+#~ msgid "Save calendar"
+#~ msgstr "Salvare calendar"
 
-#~ msgid "Other Phone"
-#~ msgstr "Alt telefon"
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Eroare la �nc�rcarea calendarului:</b>Metod� nesuportat�"
 
-#~ msgid "TTY"
-#~ msgstr "TTY"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Oprire alarm� dupa"
 
-#~ msgid "Other Address"
-#~ msgstr "Alt� adres�"
+#~ msgid "Colors"
+#~ msgstr "Culori"
 
-#~ msgid "label26"
-#~ msgstr "eticheta26"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Validez mo��ire pentru"
+
+#~ msgid "Highlight"
+#~ msgstr "Ilumineaz�"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "De terminat ast�zi"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Neteminate �nc�"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Neterminate �nc�"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Termen dep�it"
+
+#~ msgid "TaskPad"
+#~ msgstr "Panou sarcini"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Timp r�mas"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarme vizuale"
+
+#~ msgid "Work week"
+#~ msgstr "S�pt�m�n� lucr�toare"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editare task"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcare task complet�"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Editez acest task..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Editare task"
+
+#~ msgid "Go to Today"
+#~ msgstr "Mergi la ziua"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Component� actualizat� cu succes."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Nu pot �nc�rca fi�ierul calendar!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Nu pot citi fi�ierul calendar!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Acesta e un r�spuns de la cineva care n-a fost invitat!"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Nu pot �terge compenentele calendarului!\n"
+
+#~ 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"
+
+#~ msgid "Attendee address"
+#~ msgstr "Adrese participare"
+
+#~ msgid "Attendees: "
+#~ msgstr "Particip�ri"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Anulare\n"
+#~ "�nt�lnire"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizator:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Public�\n"
+#~ "Eveniment"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Data �nceput:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Nu pot testa fi�ierul de blocare pentru %s: %s"
+
+#~ msgid "No such host %s."
+#~ msgstr "Nu exist� host-ul %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Incapabil temporar s� caut hostname %s."
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Scanez folderul IMAP"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Ata� inline"
+
+#~ msgid "Send as:"
+#~ msgstr "Timite ca:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot deschde fi�ierul semn�tur� %s:\n"
+#~ "%s"
+
+#~ 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."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Acest fi�ier pare accesibil dar open(2) a e�uat."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Fi�ierul este foarte mare (mai mare de 100k).\n"
+#~ "Sunte�i sigur c� vre�i s�-l insera�i?"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Pute�i alege o alt� pagin� HTML pentru fundalul rezumatului activit��ilor.\n"
+#~ "\n"
+#~ "Pentru cel implicit l�sa�i-l gol"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Deschide %s cu aplica�ia implicit� GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Deschide %s cu navigatorul web implicit GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Trimite un email la %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Rulez %s"
+
+#~ msgid "Close %s"
+#~ msgstr "�nchid %s"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Mut� %s la dreapta"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mut� %s �n r�ndul precedent"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mut� %s �n r�ndul urm�tor"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot deschide fi�ierul HTML: \n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Fi�ierul nu are un loc pentru servicii.\n"
+
+#~ msgid "Appearance"
+#~ msgstr "Aparen��"
+
+#~ msgid "Background:"
+#~ msgstr "Fundal:"
 
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
 #~ msgstr ""
-#~ "Este %s. Ora sistemului Unix este acum %ld. Ne-am g�ndit c� poate vrei s� "
-#~ "stii."
+#~ "Componenta rezumat al activit��ilor nu poate ini�ializa Bonobo.\n"
+#~ "Dac� a fost un mesaj de avertisment despre RootPOA, probabil a�i\n"
+#~ "compilat Bonobo cu GOAD in loc de OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Procesator pentru rezumatul RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Rezumat RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Procesator pentru componenta de test bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Procesator pentru componenta de test."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Service bonobo de test"
+
+#~ msgid "Test service"
+#~ msgstr "Service de test"
+
+#~ msgid "Update automatically"
+#~ msgstr "Actualizare automat�"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Scoate criteriu"
+
+#~ msgid "Forward to Address"
+#~ msgstr "�nainteaz� la adresa"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "VFolder �n subiect"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "VFolder �n expeditor"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "VFolder �n destinatari"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Marchez ca citit"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Mut �n folderul..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copiez �n folderul..."
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Schimb� folderul \"%s\" �n formatul \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "�nchid folderul curent"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Redenumesc vechiul folder �i schimb"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiez mesaj"
+
+#~ msgid "Do you accept?"
+#~ msgstr "Accepta�i?"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution progres"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recuperez mesajul num�rul %s din %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Salvez mesajul %d din %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Mesaj scris incomplet �n conduct�!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mesaj �naintat)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "�nainte: (no subject)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mesaj �naintat (no subject)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mesaj �naintat-----<br><b>De la:</b> %s<br><b>La:</b> "
+#~ "%s<br><b>Subiect:</b> %s<br>"
+
+#~ msgid "Import files"
+#~ msgstr "Import fi�iere"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Fi�ierele Evolution au fost instalate cu succes."
+
+#~ msgid "Activate"
+#~ msgstr "Activeaz�"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activeaz� aceast� scurt�tur�"
+
+#~ msgid "Find a contact"
+#~ msgstr "G�se�te un contact"
+
+#~ msgid "View All"
+#~ msgstr "Vizualizeaz� tot"
+
+#~ msgid "View all contacts"
+#~ msgstr "Vizualizeaz� toate contactele"
+
+#~ msgid "5 Days"
+#~ msgstr "5 zile"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Creaz� calendar nou"
+
+#~ msgid "Day"
+#~ msgstr "Zi"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Deschide calendar"
+
+#~ msgid "Prev"
+#~ msgstr "Prev"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Salveaz� calendarul ca altceva"
+
+#~ msgid "Week"
+#~ msgstr "S�pt�m�n�"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Deschide calendar"
+
+#~ msgid "About this application"
+#~ msgstr "Despre aceast� aplica�ie"
+
+#~ msgid "About..."
+#~ msgstr "Despre..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Ac�iu_ni"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Agenda... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "�terge"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Verific� nume (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Copiaz� �n folder... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Descarc� XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Descarc� descrierea UI Xml"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Primul articol din folder (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "�nainteaz� (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Mergi la articolul urm�tor"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Mergi la articolul anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Task in_comlete (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "Urm�torul"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Anterior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Seteaz� tip�rire..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programeaz� ceva ce seam�n� cu o �nt�lnire"
+
+#~ msgid "Select everything"
+#~ msgstr "Selecteaz� tot"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Ce_rere task (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Despre..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "Art_icol (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "Intrare _jurnal (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "U_ltimul articol din folder (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Mesaj mail (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mut� �n folder... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Not� (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "Articol necitit (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Adaug serviciu"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Adaug un serviciu nou la Executive Summary"
+
+#~ msgid "Create a new email"
+#~ msgstr "Creez un mail nou"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Set�ri pentru Executive Summary..."
+
+#~ msgid "New Mail"
+#~ msgstr "Mail nou"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Ascunde mesajele �terse"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Tip�re�te mesaj la imprimant�"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redirectare (FIXME: de implementat)"
+
+#~ msgid "S_ource"
+#~ msgstr "Sursa"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Trimit mailurile din coad�\n"
+#~ "    �i primesc mailurile noi"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vizualizare surs� mesaj"
+
+#, fuzzy
+#~ msgid "_Compose"
+#~ msgstr "_Compunere"
+
+#~ msgid "_Reply"
+#~ msgstr "_R�spuns"
+
+#~ msgid "_Threaded"
+#~ msgstr "_�nl�n�uite"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Salvez �n _folder... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Trimit un mesaj nou"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Insereaz� fi�ier text... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Atribuie task (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Cerere de �nt�lnire (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Repetare"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Repet� ac�iunea neefectuat�"
+
+#~ msgid "Replace"
+#~ msgstr "�nlocuie�te"
+
+#~ msgid "Replace a string"
+#~ msgstr "�nlocuie�te un �ir"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "R�spuns la to�i (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Trimit_e raportul de stare (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Sari peste apari�ie (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Caut� din nou acela�i �ir"
+
+#~ msgid "Search for a string"
+#~ msgstr "Caut� un �ir"
+
+#~ msgid "Undo"
+#~ msgstr "Refacere"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Ref� ultima ac�iune"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcare complet�"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_R�spuns (FIXME)"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avansat..."
+
+#~ msgid "label26"
+#~ msgstr "eticheta26"
diff --git a/po/ru.po b/po/ru.po
index 378b4a4d25..e9a8d9c1e0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-05-08 12:41+0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-08 13:15+04:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,11 +12,21 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3278
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "������� ��� ������� ������ GnomeCard � Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "����������� ����� GnomeCard � Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "��������: "
 
-#: addressbook/backend/ebook/e-card.c:3280
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -24,7 +34,7 @@ msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card.c:3281
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -32,7 +42,7 @@ msgstr ""
 "\n"
 "  �������:    "
 
-#: addressbook/backend/ebook/e-card.c:3282
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -40,7 +50,7 @@ msgstr ""
 "\n"
 "  ���: "
 
-#: addressbook/backend/ebook/e-card.c:3283
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -48,7 +58,7 @@ msgstr ""
 "\n"
 "  ����������: "
 
-#: addressbook/backend/ebook/e-card.c:3284
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -56,7 +66,7 @@ msgstr ""
 "\n"
 "  �������:    "
 
-#: addressbook/backend/ebook/e-card.c:3285
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +74,7 @@ msgstr ""
 "\n"
 "  �������:     "
 
-#: addressbook/backend/ebook/e-card.c:3299
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +82,7 @@ msgstr ""
 "\n"
 "���� ��������: "
 
-#: addressbook/backend/ebook/e-card.c:3310
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +90,7 @@ msgstr ""
 "\n"
 "�����:"
 
-#: addressbook/backend/ebook/e-card.c:3312
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,7 +98,7 @@ msgstr ""
 "\n"
 "�������� ����:  "
 
-#: addressbook/backend/ebook/e-card.c:3313
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -96,7 +106,7 @@ msgstr ""
 "\n"
 "  ����.:        "
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +114,7 @@ msgstr ""
 "\n"
 "  �����:     "
 
-#: addressbook/backend/ebook/e-card.c:3315
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +122,7 @@ msgstr ""
 "\n"
 "  �����:      "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +130,7 @@ msgstr ""
 "\n"
 "  �������:      "
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +138,7 @@ msgstr ""
 "\n"
 "  �������� ���: "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -136,7 +146,7 @@ msgstr ""
 "\n"
 "  ������:     "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -144,7 +154,7 @@ msgstr ""
 "\n"
 "����� ��� ��������:"
 
-#: addressbook/backend/ebook/e-card.c:3343
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -152,7 +162,7 @@ msgstr ""
 "\n"
 "��������:\n"
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -160,7 +170,7 @@ msgstr ""
 "\n"
 "�������:"
 
-#: addressbook/backend/ebook/e-card.c:3370
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -168,7 +178,7 @@ msgstr ""
 "\n"
 "��.�����:\n"
 
-#: addressbook/backend/ebook/e-card.c:3373
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "��.�����:"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "�������� ������: "
 
-#: addressbook/backend/ebook/e-card.c:3398
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "�����.���������: "
 
-#: addressbook/backend/ebook/e-card.c:3410
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -208,7 +218,7 @@ msgstr ""
 "\n"
 "���������: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -216,7 +226,7 @@ msgstr ""
 "\n"
 "���.:"
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -224,7 +234,7 @@ msgstr ""
 "\n"
 "  ���:  "
 
-#: addressbook/backend/ebook/e-card.c:3424
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -232,7 +242,7 @@ msgstr ""
 "\n"
 "�������:  "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "�������2: "
 
-#: addressbook/backend/ebook/e-card.c:3426
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -248,7 +258,7 @@ msgstr ""
 "\n"
 "�������3: "
 
-#: addressbook/backend/ebook/e-card.c:3427
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -256,7 +266,7 @@ msgstr ""
 "\n"
 "�������4: "
 
-#: addressbook/backend/ebook/e-card.c:3431
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -264,7 +274,7 @@ msgstr ""
 "\n"
 "���������: "
 
-#: addressbook/backend/ebook/e-card.c:3432
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -282,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3445
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -290,7 +300,7 @@ msgstr ""
 "\n"
 "���������� ������: "
 
-#: addressbook/backend/ebook/e-card.c:3448
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -298,36 +308,24 @@ msgstr ""
 "\n"
 "��������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "��������� VCards"
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard ��� %s"
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "������� ��� ������� ������ GnomeCard � Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "����������� ����� GnomeCard � Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "�� ������� ���������������� Bonobo"
 
@@ -340,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook �� ���������\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "�� ������� ��������� ������ wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "�� ������� ��������� wombat"
 
@@ -356,728 +354,855 @@ msgstr "�� ������� ��������� wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "���������� �������� ���� ���������� ������� ������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "��� ���������� � ������������� �������� ����� Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "����������� ������������ �������� ����� Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "��������� Evolution ��� ��������� ���������."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "������� ��� ������������ ������ �� �������� �����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "������� ��� ������������ ������ �� �������� �����"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "������� ���������� �������� ����� Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "�������� ����� ��� �������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "������ LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "����"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "����������� ��� �������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "��� (��������� �����)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "������"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "����������� ��� �����������"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "������"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "����"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "���������"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "����������� ��� ������� ��������"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "��������� ���� ������"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "����� ������� ��������:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "�������������:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "������� ����, ���� �� �� ����������."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "������ �������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "�������� �������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"�������� ��� ����� �������� ����� � ������� ��������������� ���������� � ���."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "���:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "��������:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+msgid "Addressbook Sources"
+msgstr "��������� �������� ����"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "�������"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "���"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr "��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "������"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "������ ��������"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "������� ������ ��� %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "�� ������� ������� �������� �����"
+
+#: addressbook/gui/component/addressbook.c:380
+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 ""
+"�� ������� ������� ��� �������� �����. ��� ������,\n"
+"��� ���� �� ����� ������������ URI, ���� LDAP\n"
+"������ �� ��������"
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"��� ������ Evolution �� ����� ���������� ��������� LDAP.\n"
+"���� �� ������ ������������ LDAP � Evolution, �� ������\n"
+"����������������� ��������� �� �������� ������� � CVS �����\n"
+"��������� OpenLDAP ����������� �� �����ģ���� ���� ������.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
+"� ��� � ��� ���� ����������� ����� �������."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "����� ���� ��������"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "��� ��������"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "��.����� ��������"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "��� ��������"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ������� ����� ���������� ��������� ��������� �����"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "������ ��.�����"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "��.����� 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "��.����� 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "������� ����"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "������� ����� �������"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "������ �������� �����"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "������ ���������� ����������"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "�������� � ���������"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "��.�����:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "��������� �������"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "�������� ������� (������!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "��������� ������ ����� � �������� ����� Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "�������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "������� ���"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "�������� ��.�����"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "������ ��������"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "���������� ���������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "������� �����"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "������� ����� ��:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "���������:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "���������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "�������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "������� ����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "��������..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "���������..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "�������� ���������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "���� ���:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "�����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "����� ��� ��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "�������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "�����������:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "��� ��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "������ ��.�����"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "����� �������� ����� � HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "����� web-��������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "��������"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "�����..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "��� ���������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "���� ��������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "�������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "��������:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "��������..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:640 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "�������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "�����"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "������ ���..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "���������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "��� ���������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "���������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "���������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "����:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "���������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "������(�):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "��� �������� �����"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "������� �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "���� ������� ����������� ��������� ����������:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "��������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "�������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "������� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "������� ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "�������� ������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "��������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "��������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "�������� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "�������� ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "���������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "������ ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "�������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "�����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "��.����� 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "��.����� 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "������� �������?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "������� ���������� ��������"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "������ ������� �����"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "������ ���:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "��.�����"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "����� 2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "��������� �����"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "������:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "���������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "���"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "�����:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "�����:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "��.����:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "�������/����� (����/���������):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "�������� ������:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "��������� ������ ���"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "��."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "����."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "��."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "����"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "���:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "�������:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "��������:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "�������:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "���������:"
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr "��� ������������"
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "��� �������"
-
-#: addressbook/gui/component/addressbook.c:408
-#, c-format
-msgid "Enter password for %s"
-msgstr "������� ������ ��� %s"
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Unable to open addressbook"
-msgstr "�� ������� ������� �������� �����"
-
-#: addressbook/gui/component/addressbook.c:443
-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 ""
-"�� ������� ������� ��� �������� �����. ��� ������,\n"
-"��� ���� �� ����� ������������ URI, ���� LDAP\n"
-"������ �� ��������"
-
-#: addressbook/gui/component/addressbook.c:448
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"��� ������ Evolution �� ����� ���������� ��������� LDAP.\n"
-"���� �� ������ ������������ LDAP � Evolution, �� ������\n"
-"����������������� ��������� �� �������� ������� � CVS �����\n"
-"��������� OpenLDAP ����������� �� �����ģ���� ���� ������.\n"
-
-#: addressbook/gui/component/addressbook.c:456
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
-"� ��� � ��� ���� ����������� ����� �������."
-
-#: addressbook/gui/component/addressbook.c:607 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "����� ���� ��������"
-
-#: addressbook/gui/component/addressbook.c:608
-msgid "Name contains"
-msgstr "��� ��������"
-
-#: addressbook/gui/component/addressbook.c:609
-msgid "Email contains"
-msgstr "��.����� ��������"
-
-#: addressbook/gui/component/addressbook.c:752
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ������� ����� ���������� ��������� ��������� �����"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "������ LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "����������� ��� �������� �����"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "��� (��������� �����)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "������"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "����������� ��� �����������"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "������"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "���������"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "����������� ��� ������� ��������"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "��� �����:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "�������"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: 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 ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "��������� ���� ������"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "����:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "�������"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "�������� ���������"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "�������� ���������"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "����� ������� ��������:"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "�������������:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "������� ����, ���� �� �� ����������."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "������ �������� �����"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "����� �������"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "�������� �������� �����"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "������ ��������"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"�������� ��� ����� �������� ����� � ������� ��������������� ���������� � ���."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "���:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "��������:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "��������� �������� ����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "�������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "���"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "������ ��������"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "��������� �������"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "�������� ������� (������!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "������ ���������� ����������"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "�������� � ���������"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "��� ���������� � ������������� �������� ����� Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "����������� ������������ �������� ����� Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "��������� Evolution ��� ��������� ���������."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "������� ��� ������������ ������ �� �������� �����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "������� ��� ������������ ������ �� �������� �����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "������� ���������� �������� ����� Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "�������� ����� ��� �������� �����"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "�������"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "������� ���"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "��������� ������ ����� � �������� ����� Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "�����..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "���������� ���������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "������� �����"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "������� ����� ��:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:148
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "�����"
 
@@ -1189,150 +1314,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "��������� ��� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "������� ������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "������� ��������� � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "������ ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "������ ��� �������� %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "���������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "����������� ������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "�������� ��� ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "����� � �������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "���� �� ������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "�������� �� ��������������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "��������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "������ �����/������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "������ ��� �������� %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "������ ��� �������� %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "������ ��� �������� %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "������ ��� �������� %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"������ ��� ������ ������:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* �������� ����� ��� ���������� �������� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "���� ���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "��.�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "������ �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "������� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "�������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "�������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "��������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "������� � ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "������� ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "�������� ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "������ ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "���� � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "������(�)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "�������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "�������� ���������..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "��������� � �������� �����"
 
-#: addressbook/gui/widgets/e-minicard-view.c:469
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1375,7 +1604,8 @@ msgid "Dimensions:"
 msgstr "�������:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "�����..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1435,7 +1665,6 @@ msgid "Margins"
 msgstr "����"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "����� ��������:"
 
@@ -1516,40 +1745,61 @@ msgid "Width:"
 msgstr "������:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "�����26"
+#, fuzzy
+msgid "_Font..."
+msgstr "�����..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "������ ��� ����������� � ������� ���������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "���������� �������� ���� ���������� ��������� ������"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "���������� �������� ���� ���������� ������� ������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "���������� ��� ���� ��������"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "�������� ���"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "��������� Executive Summary ��������� Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "����������� iTip/iMip ��������� Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "��������� Evolution ��� ��������� ���������."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "������� ���������� ��������� Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "������� ���������� ��������� Evolution."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1560,143 +1810,257 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr "���������� ���������������� �������� ����� Evolution."
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "�������� ���������� � ��������� Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "������ �� %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "�������"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "�������� ���"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "����� �������� (�����)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "������ �������"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "���� �� ��������."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "���������� ��� ���� ��������"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "�������� ���"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr "��� %s. ������ %ld. �� ������ ��������, ��� �� ������ ��� �����."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "�� ������� ���������������� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "�� ������� ���������������� Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "�� ������� ������� ��������� �������: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "���� �� ������"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "������� ���������"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "��������� ���������"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�� ������� ������� ���� ���������. ���������� ��������� ���� ��������� ORBit "
 "� OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "����������������"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "�����������"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:694
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:693
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:692
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "�� ������"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "� ��������"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "��������"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1707,7 +2071,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1715,17 +2079,21 @@ msgstr ""
 "��� \"�������\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1735,119 +2103,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�������� �������� ������ ���� ����� 0 � 100, ������������"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "��������� ������ ���� \"�������\", \"����������\", \"������\" ��� "
 "\"��������������\"."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "������������ ������ ���� \"����������\", \"������������\" ��� \"�������\"."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "���"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "�������� ��������"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "�������"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "������� ������"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "���������� ���� ���������"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "�������"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "�����"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>������ ��� �������� ���������</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, ������� ����� ���������� ���������"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>������ �������� ���������:<br>����� �� ��������������"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "����� �������"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "����������"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "���������� ���������"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "�������� �������"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "���������� ���������"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "�������� �������"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "�������"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "�������� ���������"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ������� ����� ���������� ���������"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "������ �� %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "��������� ���������"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "����������� � ����� ������� � %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "������������� ����"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "���� �� ��������."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "�������"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "��������� ���������"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "������ �������"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "����� �������� (�����)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "���"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "��������� ������ "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "����"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "������"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d ����"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 ����"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d ������"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 ������"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d �����"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 ���"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d �����"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 ������"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d ������"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 �������"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "������������� ����"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "�������� ��� ��������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "��������� �����"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "��������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " �� ������ �������"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " ����� ������ �������"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " ����� ���������� �������"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " ����� ��������� �������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "���� � �����"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "�����������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "����:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "���������"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "�����"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "��"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "����"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "���������� �������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "����"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "������ �������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1878,36 +2422,38 @@ msgid "60 minutes"
 msgstr "60 �����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "�������� ������� ��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "����� �������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "����� ��� ������������� ���� �������."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "���������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "��������� ���������"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "�����"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "����� �������� ���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "��������� ���������� ���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1915,584 +2461,1087 @@ msgid "Defaults"
 msgstr "���.��������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "���������� ���������"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "����������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "����������� ����"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "��������� ������� ��� ��� "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "����� ���:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "������ ���� ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "������������ ���:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "������� ������������� �� �������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "������� ������������� �� �������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "��� �� ������������ �������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "��� �� ������������ �������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "������������ �������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "������������ �������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "������� ����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "���������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "������������ �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "���������� ��� ���� ��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "�����������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "��������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "�������� ����� ��������� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "�������� ������ ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "������ ���:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "������ �������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "������� ������������� �� �������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "����� �� ������������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "���������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "����������� �������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "������ �������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"������� ����: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "������� �������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "������� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "����� �� ������������ �������."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "������."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "�� ������� ��� ������ ������� ���� ����?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "�� ������� ��� �� ������ ������� ���������� ������ \"%s\"?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "���������"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "���������"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "����������� ����"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "������ �������"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "������� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "������� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "���������� ������ - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "��� �����"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "���������� ����?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"���� � ����� ��������� ��� ����������.\n"
+"���������� ���?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "��������� ���..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�� ������� ��� ������ ������� ��� ��������������� �������?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�� ������� ��� ������ ������� ��� ��������������� �������?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�� ������� ��� �� ������ ������� ���������� ������ \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�� ������� ��� ������ ������� ��� ��������������� ���������� ������?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "������ ��������� ���������?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "������ �������"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "������� - %s"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "�� ������� ��� �� ������ ������� ���������� ������ \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "������� - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "������� ����"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
-msgstr "���������� ������ - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "�������:"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "��� �����"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"������� ����: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ����������:"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "�������"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "�����������"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "����������"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "�������� �������"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "��� ������� ���"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "�������������"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "���� � �����"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "���� ����������:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "�����������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "�����"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "���� ������:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "����:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "�������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "����������������"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "��������..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "����� ���������:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "����������� ����:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "����� ������:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "���������:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "���������:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "�������� ������:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "���������"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "�������� ������:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "������������"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "��������� ���������"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "�������������� ���������"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "�������� ��������"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " ������� "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " ��������� "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "�����������������"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "���������"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "� ��������"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "������� � ������"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "��������� ���������"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "�������������� ���������"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "�������������� ���������"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "������������"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "�������..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "�������������"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "���� ������������"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "���� ���������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "���������"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "���� ������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "���������"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "�������������� ������������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "�����������"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "������� ������������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "����"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "������������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "���������"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "����� �������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "���"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "�������� ����� ��� ���������� ������"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "�����������:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "�����������:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "���������� ������..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "�����������:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
+"� Evolution."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "�"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "����"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "��"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "������ ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "��� ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "��������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "������� ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "������� ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "��������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "��"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "������"
+
+#: 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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "���� ����������:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "���������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "���������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "���"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "�������"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% ����������:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "�����������"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "���� ������:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "����������� ����:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "���������:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "���������:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "�������� ��� �����������"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "�������� ������� ��� �����������"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "������ ����� �������..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "�����������"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "������ �������"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "�������� ��� �����������"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "������� ��� �������"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "�������� ��� �����������"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "������� �������"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "�.�."
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "�������� ����� ��� ���������� ������"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "�.�."
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ����������:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "����� �������"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "���� ������������"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "����������� ����"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "���� ���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "�������������� ������������"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "���� ������"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "����"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "�������"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "������������"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "�.�."
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "�.�."
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "����� ���������� �������"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "�������"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "������� � ������������ ���"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "������� � ����..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "�������"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "������� ��� �������"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "�������� ������� � ����������"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "������� ��� ������� ������������"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "�� ������� �������� ��� ���� ���������!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "��� �������� �����"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "��������� ������� ��������."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "��� �������� ����� ��������� �������� ������."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "�� ������� ������� ��� ���� ���������!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "�� ������� ��������� ��� ���� ���������!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "�� ������� �������� ��� ���� ���������!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "��� ��������� � ��������� ������ �� ��������"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "��� ����� �� ����-�� ��� �� ��� ���������!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "�� ������� �������� ��������� ������ ���������."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "�� ������� ������� ��������� ���������!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "��������� ������� ������."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "�� ��������� ���� ��� ���������� ���������."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "�������� � ���������"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " ������� "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " ��������� "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
-msgid " Tentative "
-msgstr "�����������������"
+msgid "The message does not appear to be properly formed"
+msgstr "������ ����� ������������� ���������."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "�������� ���������"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "�������� �������"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "�� ������� �������� ��� ���� ���������!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "�� ������� ������� ��� ���� ���������!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2507,26 +3556,22 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "����:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "�������� ���������"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "�������� ���������..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "�����������:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "��������� �������:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "����:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "����-����������"
@@ -2535,422 +3580,48 @@ msgstr "����-����������"
 msgid "date-start"
 msgstr "����-������"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "�������������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "����� �������������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "�������������:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"��������\n"
-"�������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "������������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "����������� �� �������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "�������������� ���������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "�����������:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"���������\n"
-"�������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "��������� ���������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "����"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"�������� �������\n"
-"� ����������"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1086
-msgid "Status"
-msgstr "���������"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "���"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "���������:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "���������� ��������� ������� � \"%s\""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "������ �������"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "�"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "����"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "��"
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "������"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
-"� Evolution."
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr "%d ����"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 ����"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d ������"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 ������"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d �����"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 ���"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d �����"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 ������"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d ������"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 �������"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "������������� ����"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "�������� ������"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "��������� �����"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "��������� ���������"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr " �� ������ �������"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr " ����� ������ �������"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr " ����� ���������� �������"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr " ����� ��������� �������"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "��� ������� ���"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "�������"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "��������� �������"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "������ ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "��������"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "��� ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "��������"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "������� ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "�����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "���������..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "������� ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "����� ���������:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "����� ������:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "���� ������:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "�����"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "����"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "���������� �������"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "�"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "����"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "�����26"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "�����26"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "������ �������"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "��"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "���"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "����� �������..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "���� ��������"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "�������� ��������"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "���������� ��������"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "����� ���������"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "����� �������..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "���������� ������� ����� \"%s\""
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "��������� Executive Summary ��������� Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "����������� iTip/iMip ��������� Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "��������� Evolution ��� ��������� ���������."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "������� ���������� ��������� Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "������"
@@ -2972,232 +3643,256 @@ msgid "Go To Date"
 msgstr "������� � ����"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "�������"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "������"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "����"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "����"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "����"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "���"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "������"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "�������"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "�������"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1-��"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2-��"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3-��"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4-��"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5-��"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6-��"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7-��"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8-��"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9-��"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10-��"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11-��"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12-��"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13-��"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14-��"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15-��"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16-��"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17-��"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18-��"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19-��"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20-��"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21-��"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22-��"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23-��"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24-��"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25-��"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26-��"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27-��"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28-��"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29-��"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30-��"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31-��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "C�"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "�������"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "������� ���� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "������� ������ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "������� ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "������� ��� (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "���������� ���������"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "�������� ������"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "������ ����� ��������"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "��������� ��������"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ������� ����� ������� � ����� ������� "
 
@@ -3235,81 +3930,101 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "�������"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "������������ �� �������������� ���� ������"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "��������� ��� �� �������������� ��� ����� ��������"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "�������� �� �������������� ���� ������"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "���������� �� �������������� ���� ������"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "����������� �� �������������� ���� ������"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "�� ������� ������� ����� �����"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "�� ������� ���������� ����� �����"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "��������� ��������� %s"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "������� ��������� %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "���������� ������� ���������"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "���������"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���������� �������: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���������� ������ �������: %s: %s"
@@ -3345,14 +4060,33 @@ msgstr "���������� ������� �� ����������� ���������: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "������������ ��� � ����-��������, ��������� ������"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "�� ������� ������� �����: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "�� ������� �������� �����: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ������� ������� ���� ���������� ��� %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3369,113 +4103,108 @@ msgstr "�� ������� �������� lock ��������� fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "�� ������� �������� lock ��������� flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "�� ������� ��������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "���������� ������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "���������� ������� ��������� �������� ���� %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "���������� ��������� ���� ���������� ��� %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "������ ��� ������ ��������� �����: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "������ ���������� ���������� ��������� �����: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "���� ��� ���������� ����� �� ��������� ����� %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�� ������� ������� �����: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�� ������� ����������: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "���� ��������� ����������� �����: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(����������� ������)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "������ ��� ������ ��������� �����: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "������ ���������� ���������� ��������� �����: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "������ ����������� ���������� ��������� �����: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "���������� ������� ���� %s ��������� ����� ��� %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "���������� ������� ���� %s ��������� �����."
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "��� ������ ��� �������."
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "������ �� ������������."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "�� ������� ������� ����� � GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "��� ������ ��� ��������."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "�� ������� ������� ��������� ����: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "��� ������ ��� ����������."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "�� ������� ����������"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "��� ����� ��� ����������."
 
@@ -3510,7 +4239,7 @@ msgid "Connection cancelled"
 msgstr "���������� ��������"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ������� ������������ � %s (���� %d): %s"
@@ -3519,13 +4248,13 @@ msgstr "�� ������� ������������ � %s (���� %d): %s"
 msgid "(unknown host)"
 msgstr "(����������� ����)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "�������� ��������"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "������ ���������� ����������"
 
@@ -3637,7 +4366,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "������������� ����� ������������� �� �������."
 
@@ -3703,12 +4432,12 @@ msgstr "��������� ����������� ����� ����������� �����"
 msgid "For reading mail as a query of another set of folders"
 msgstr "��� ������ ����� �� ������� � ������� ������ �����"
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "��������� ��� ��������� \"%s\" �� ��������"
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3717,33 +4446,53 @@ msgstr ""
 "���������� ������� ������� %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "�������� �������"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "���������� ������� ���� %s ��������� ����� ��� %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "���� ���� �� ����������."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "���� ���� �� ����������."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "���� ��� �������� ����� ������������ �� ������"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "������� ��������� %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"��.�����: %s\n"
-"���: %s\n"
-"�������������: %s\n"
-"�����������: %s\n"
-"������������: %s\n"
-"�������: %s\n"
-"������: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3758,17 +4507,36 @@ msgstr ""
 "\n"
 "�ӣ ����� �������?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"��.�����: %s\n"
+"���: %s\n"
+"�������������: %s\n"
+"�����������: %s\n"
+"������������: %s\n"
+"�������: %s\n"
+"������: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "���������� ���������������� URL \"%s\""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "��� ��������� %s � %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "��� ������ ���������: %s"
@@ -3777,64 +4545,75 @@ msgstr "��� ������ ���������: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "�� �� ������ ����������� ��������� �� ���� ����� ��� ������."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "���������� ������� ������� ���: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "����������� ����� �� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "���� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "����������� ������"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "����� ������� ���������� ������� ����."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "����� IMAP ������� �� �������� ���������� �� %s"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� ����� \"OK\" �� IMAP �������: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "���������� ������� ������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "���������� ��������� ���� ��� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
-msgstr "������������ ����� IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "���������� ���������"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "��� ��������� � ��������� ������ �� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "���������� ���������"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "���������� ����� ���� ��������� � ������ FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "���������� ������� ������� ���: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "�������� ����� �����"
 
@@ -3842,7 +4621,7 @@ msgstr "�������� ����� �����"
 msgid "Check for new messages in all folders"
 msgstr "�������� ����� ����� �� ���� ������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "�����"
 
@@ -3878,28 +4657,28 @@ msgstr ""
 "����������� � IMAP ������� ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������������ ������������� ��� ������������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:464
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "������������� ���� %s �� ��������������"
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3910,36 +4689,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ����� ����� %s"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "�������� �������� � ������� UNIX MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "��� �������� ��������� ����� � �������� ��������� ���� MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "����������� ���� Unix mailbox"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "��� �������� ��������� ����� � �������� ��������� ������� mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "�������� ����� � ������� �������� ��������� qmail"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "��� �������� ��������� ����� � �������� ��������� ���� qmail"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "�������� ����� � ������� �������� ��������� qmail"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "��� �������� ��������� ����� � �������� ��������� ���� qmail"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -3979,24 +4773,24 @@ msgstr "�� ������� ������� �������� ���� ����� \"%s\": %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ������� ������� ��������� ���� ����� \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�� ������� �������� ��������� � �����: ������� ����������"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �������� ��������� � ����� ��������� ��������: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4005,18 +4799,19 @@ msgstr ""
 "���������� �������� ���������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "��� ������ ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "������������ ���������� ���������"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4026,14 +4821,14 @@ msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "����� \"%s\" �� ����������."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4043,13 +4838,13 @@ msgstr ""
 "�� ������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" �� �������� �������� ���������."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
@@ -4057,10 +4852,17 @@ msgstr ""
 "���������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "�� �������� �������� �������"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"�� ������� ������� ����� \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4068,11 +4870,13 @@ 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:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "�� ������� ������� �������� ����: %s: %s\n"
@@ -4082,9 +4886,12 @@ msgstr "�� ������� ������� �������� ����: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "���������� ������������ ��������� � ����� mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4093,11 +4900,13 @@ msgstr ""
 "���������� �������� ���������: %s �� ����� %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������ ����� ������������� ���������."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "���� � ����������� ���������: �������� ���� ���������?"
 
@@ -4143,36 +4952,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "������������ �����"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "�� ������� ������� �����: %s: ���� � ������� %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "�� ������� ����������� �����: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "������������� �����"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "�� ������� ������� ����� ��� ������������: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ������� ������� ��������� �������� ����: %s"
@@ -4181,21 +4999,28 @@ msgstr "�� ������� ������� ��������� �������� ����: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "������������ ����� � �����, ���� ����� �������������"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ������ �� ��������� �������� ����: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "���� ������ �� ��������� �������� ����: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���������� ������� �������� ����� %s: %s"
@@ -4210,13 +5035,14 @@ msgstr "���������� ������� ��������� �����: %s"
 msgid "Could not rename folder: %s"
 msgstr "�� ������� ������������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "����������� ������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "���������� �������� ��������� � ����� mh: %s: %s"
@@ -4231,39 +5057,92 @@ msgstr "\"%s\" �� �������� ���������."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�� ������� ������� �������� ����: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "���������� ������������ ��������� � ����� mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "%s �� �������� ������� ������."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "����� \"%s\" �� ����������."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "��������� �������� ���� %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "���������� ������� ��������� �������� ���� %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "���������� ������� �������� ����� %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "����������, ������� ������ NNTP ��� %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "������ �������� ��� ������������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "���� ��� �������� ����� ������������ �� ������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "������ �������� ��� ������������/������"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "��������� %s �� �������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "�� ������� �������� � ������� ������ �����."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "�� ������� ��������� ���� ������ ����� ��� %s: %s"
@@ -4277,17 +5156,17 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "��� ��������� ��� ������ � �������� ��������� � ������ �������� USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "���������� ������� ������� ��� ������� ��������: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "������� USENET ����� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4295,8 +5174,8 @@ msgstr ""
 "����������� � NNTP ������� ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "�� ������� ������� ��� ������� ���� .newsrc ��� %s: %s"
@@ -4347,7 +5226,7 @@ msgstr "��������� ��������� �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ����� %s ����"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4443,7 +5322,7 @@ msgid "No such folder `%s'."
 msgstr "��� ����� ����� \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4496,7 +5375,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "�������� ����� ����� ��������� sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4506,123 +5385,123 @@ msgstr ""
 "��� �������� ����� � ������� ����������� � ���������� ��������� ���� �� "
 "��������� SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "�������������� ������, ������� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "�������������� ������ � ���������� ��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "�������� ������� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "��������� ������� ��� ����� ������� �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "���������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "������ �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "������ ��������� ����� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "������ �� ��������, �������� ������ ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "����������� �������� �������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "�� ��������� ������������; ����� ���������� � <����-��������>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "����������� �������� � ������ �� ���������: �������� ���� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "����������� �������� �� ���������: �������� ���� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "����������� �������� ��������: ������ ��� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "������������ �� ���������; ���������� ���������� <����-���������>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "����������� �������� �� ���������: ������������ ���������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "����������� �������� �� ���������: �������� ��������� ����� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "������ ����� �����; ��������� ����� <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "���� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "���������� �������� ������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "������� ������ �������� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "��� ������������ ��������� ������������� ��������� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "��������� ���� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "������������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP ������ %s �� ������������ ������������� ��� ������������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s����������, ������� ������ SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4633,316 +5512,236 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� SMTP ����� ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "���������� ��������� ���������: �� ��������� ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "���������� ��������� ���������: ������������ ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "�������� ���������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������ ������ HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "�������������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:805
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "������������� ����� ������������� �� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:831
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "������ ������ MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� RCPT TO: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "������ ������ RCPT TO: %s: ����� �� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� DATA: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:944
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "������ ������ DATA: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:959
-#: camel/providers/smtp/camel-smtp-transport.c:977
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:996
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "������ ������ DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "������ ������ RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "������ ������ QUIT: %s: �� ��������"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f�"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "��������"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "������������ ����"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� �������� �� ������ ��������"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "�������� ��������..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "������������ ���� � ���������"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1086
-msgid "Attachment"
-msgstr "��������"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "�������� ��������"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "��� �����:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "���������� ��������"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "��� MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "��������� ���:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"���������� ������� ���� ������� %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "��������� ���..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "������ ���������� �����: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "������ ��� �������� �����: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"�� ������� ������� ����� ���������� ��� ����� �ޣ��.\n"
-"������ ������������ ����� ���������� �� ���������?"
-
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"��� ��������� �� ���� ����������.\n"
-"\n"
-"�� ������ ��������� ���������?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "������� ����"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "���� ���� �� ����������."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "��� �� ������� ����."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "���� ���� ����������, �� �� ��������."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr "���� �������� ���������, �� ��������� ���� open(2)."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"���� ����� ������� (������ 100�).\n"
-"�� �������, ��� ������ �������� ���?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "��� ������ ����� �������� ������."
-
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
-msgstr "���������� ������� ���� ���������."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "�������� ����� ��� �������� �����"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "��������:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "������� ����������� ���������"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "�����:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "������� ���������, ������� ������� ����� ���������"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "���.�����:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4950,7 +5749,137 @@ msgstr ""
 "������� ���������, ������� ������� ����� ��������� �� ����� � ������ "
 "�����������."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "������������ ����"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"���������� ������� ���� \"%s\":\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "������ ��� �������� �����: %s"
+
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "��������� ���..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "��������������"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "������ ���������� �����: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "������ ��� �������� �����: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"�� ������� ������� ����� ���������� ��� ����� �ޣ��.\n"
+"������ ������������ ����� ���������� �� ���������?"
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "������ ���������� �����: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "�� ������� �������� ��������� � POP ������� %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"�� ������� ������� ���� ������: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"�� ������� ������� ���� ������: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"������ ���������� ��������� �: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution ����� �������� ����� Pine.\n"
+"������ ������������� �� � Evolution?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"��� ��������� �� ���� ����������.\n"
+"\n"
+"�� ������ ��������� ���������?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "������� ����"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "�������� ��������� ����..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "������� ���������"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "���������� ������� ���� ���������."
+
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4958,7 +5887,7 @@ msgstr ""
 "�� ������� ������� ���� ���������, ������ ��� �� ��� �� ���������\n"
 "�� ����� �������� � �������� ����������."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "���������� ���������������� �������� ����� Evolution."
 
@@ -4975,36 +5904,56 @@ msgid "calendar information"
 msgstr "���������� ���������"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+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:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+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:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5012,264 +5961,65 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"���������� ���������������� ��������� Executive Summary ��������� Evolution."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"���������� ������� HTML ����:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"������ ��� ������ ������:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "������� ������"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "������� %s � ������� ����������� ���������� GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "������� %s � ������� ��������� ��������� web ��� GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "��������� ����� %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "�������� ��� �� %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "��������� %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "������� %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "����������� %s �����"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "����������� %s ������"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "����������� %s � ���������� ������"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "����������� %s � ��������� ������"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "��������� %s"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "������� ���"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "���:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "��������� Evolution ��� Executive Summary."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "������� ��� ���������� Executive Summary ��������� Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "������� ��� ����� RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "���� RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "������� ��� ��������� ����������."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "��������� ������ bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "��������� ������"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "������"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "��������� �������������"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "�������� ������"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "��������� ������ "
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "������"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "���"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "����"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "�����"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "������"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "������"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "������"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "���"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "���"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "����"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "������"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "�������"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "�������"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "��-��! �� ������ ������� ����."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "��-��! �� ������� ������������ ����."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5279,7 +6029,7 @@ msgstr ""
 "�� �������� ������� �������, ���� \n"
 "�������� ����.�����."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5287,7 +6037,7 @@ msgstr ""
 "���� ��������� ����� ������������ � �����,\n"
 "������� �� ������� �����."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5298,28 +6048,36 @@ msgstr ""
 "�������� \"������ �����\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "������� �����"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "��������� ���� �����"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "����� ������������ ��������"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "���������� �"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "������"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<�������� ����� ��� ������ ����>"
 
@@ -5344,8 +6102,8 @@ msgstr ""
 "��-��... �� ������ ������� �����.\n"
 "����������, ��������� � ������� ���������� ����� ��� �������� �����."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "������� �����"
 
@@ -5357,46 +6115,6 @@ msgstr "������ URI �����"
 msgid "<click here to select a folder>"
 msgstr "<�������� ����� ��� ������ �����>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "������ ��������"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "������ ����.�����"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "��������"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "���������"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "����������� �����"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "������ ��������� �����"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "��������� ����.�����"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "�� ����� ��������� ���̣����� �������"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "�� ����� ���������� � ��������� ���̣����� �������"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "�� ����� ���������� �������"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5418,36 +6136,88 @@ msgstr "�������� �������: "
 msgid "Untitled"
 msgstr "���������������"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "����"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "��������� ��������"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "���� ������������� ���� ���������"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "���� ������������� ������ �� ���������"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "�������� ��������"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "��������"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "���������"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "��������"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "������"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "������ ��������"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "������ ����.�����"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "��������"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "���������"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "����������� �����"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "������ ��������� �����"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "��������� ����.�����"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "�� ����� ��������� ���̣����� �������"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "�� ����� ���������� � ��������� ���̣����� �������"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "�� ����� ���������� �������"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "������� ����"
 
 #: filter/libfilter-i18n.h:4
@@ -5523,90 +6293,91 @@ msgid "Expression"
 msgstr "���������"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "��������� �� ������"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "������ ��������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "��������� ���� ��������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "��������� ���� ����������"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "�� ��� �����"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "�� ��� ��"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "���������� ���.���������"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1086
+#: 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:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "���������� ���������"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "������"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "������ ���"
@@ -5627,7 +6398,8 @@ msgstr "���������� �"
 msgid "Stop Processing"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1087
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
 
@@ -5655,188 +6427,275 @@ msgstr "������ �������"
 msgid "Score Rules"
 msgstr "������� ��������"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "�������������"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "��.�����"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Elm.\n"
+"������ ������������� �� � Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "����� Elm"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "�������� �������� �����"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Netscape.\n"
+"������ ������������� �� � Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "���������..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Netscape.\n"
+"������ ������������� �� � Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Pine.\n"
+"������ ������������� �� � Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "����� Pine"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "��������� Evolution ��� ��������� �����."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "��������� ��������� ����� Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "��������� Executive Summary ��������� Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "��������� ����������� �������� ����� Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "������� ��� ��������� ����� Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "������� ��� ��������� ���������� Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "��������� �����"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "��������..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "�������� �������� �����"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "���������� ���������������� �������� ��������� \"��������\"."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "�� ������� ���������������� ��������� � ������� ��������"
 
-#: mail/folder-browser.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "�������� ��� \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "��������"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "�� ������� ������� ��������� �������: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "��������� ���������� ������ � ����������� �����"
 
-#: mail/folder-browser.c:576 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "����.����� �� ����"
 
-#: mail/folder-browser.c:579 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "����.����� �� �����������"
 
-#: mail/folder-browser.c:582 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "����.����� �� ����������"
 
-#: mail/folder-browser.c:585 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "����.����� �� ������ ��������"
 
-#: mail/folder-browser.c:591
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "������ �� ����"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:609
-msgid "_Open"
-msgstr "�������"
-
-#: mail/folder-browser.c:611
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "�����������"
 
-#: mail/folder-browser.c:613 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "��������� ���..."
 
-#: mail/folder-browser.c:615 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "������"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "�������� �����������"
 
-#: mail/folder-browser.c:622 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "�������� ����"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "�������� ����"
 
-#: mail/folder-browser.c:624 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:626
-msgid "Forward _inline"
-msgstr "��������� ����������"
-
-#: mail/folder-browser.c:629 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "�������� ��� �����������"
 
-#: mail/folder-browser.c:631 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "�������� ��� ������������"
 
-#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "������"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "�������� ��� ������������"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:642 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "������������"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "�������� �������� �����"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "��������� �������"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "������� ������� �� ���������"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "����.����� �� ������ ��������"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "����.����� �� ������ �������� (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "�������� ��� \"%s\""
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "��������"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "��������� Evolution ��� ��������� �����."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "��������� ��������� ����� Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "��������� Executive Summary ��������� Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "��������� ����������� �������� ����� Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "������� ��� ��������� ����� Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "������� ��� ��������� ���������� Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution ����� �������� ����� Elm.\n"
-"������ ������������� �� � Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "����� Elm"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "������� ��� ������� ������ mbox � Evolution"
@@ -5853,26 +6712,6 @@ msgstr "������� ��� ������� ������ Outlook Express 4 � Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "����������� ����� Outlook Express 4 � Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution ����� �������� ����� Netscape.\n"
-"������ ������������� �� � Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution ����� �������� ����� Pine.\n"
-"������ ������������� �� � Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "����� Pine"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "������� ������ ��������:"
@@ -5907,37 +6746,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "�� �� ����� ��� ����������� ����������."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "�������� ������ Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "�������� ������ Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "���� �������:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"��� ��������� �� ���� ����������.\n"
+"\n"
+"�� ������ ��������� ���������?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr "(���.��������)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "���������"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "��������"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ������� ��� ������ ������� ���� ����?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "������������"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "������� ���� ������ �� ���������"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "��������� ������ Evolution"
 
@@ -6005,37 +6876,45 @@ msgstr ""
 "��� ��������� �� ����� ����.\n"
 "������� ���?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr "�� ������ ������� �����������, ����� ��������� ��� ���������."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "�� ������ ��������� ���� �� ���� ��� �� ������� ������� �����."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s, %s �������:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "����������� ���������:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "����������� ��������� �"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "����������� ��������� �"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� ������� ��� �� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6043,7 +6922,7 @@ msgstr ""
 "�� ������ ������� ������ ���������\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6051,31 +6930,24 @@ msgstr ""
 "�� ������ ������ ����������� ���������\n"
 "�� ����� \"������������\"."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "�� ������� ��� �� ������ ������� ��� %d ���������?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "��������� �� �������"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "���������� ����?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"���� � ����� ��������� ��� ����������.\n"
-"���������� ���?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6084,23 +6956,24 @@ msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "�������..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "������ ���������"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "���� ������ ���������"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "����������� � �������..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6146,10 +7019,14 @@ msgstr ""
 "�����������."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "�������� �� ������ Evolution"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "����������� � �������..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " �������� �������������� ����� "
@@ -6159,34 +7036,64 @@ msgid " color"
 msgstr " ����"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "������������ �� �������������� ���� ������"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "����"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "���������� � �����"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "���������� �������"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "��� �������������: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "������������� ��������� ����� ������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6202,163 +7109,279 @@ msgstr ""
 "\n"
 "������� \"���������\", ����� ��������� ���� ���������."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "���.��������"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "����� ����������:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "������..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "��.�����:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "������ ���:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "���� �������:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "������������ ������ "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "��������� �����"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "������ ��������� �����"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "������� ���� ������ �� ���������"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "�������� ��������� ��� \"�����������\" �����:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "������ LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "�������������� ����������"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "�����������:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "���� � ��������� PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "������� ����"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "���������� ��������� ���������: �� ���������� ����������."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "�������� ������� Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "���������������"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "��������� ����������"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "����������� ����������"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "������������"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "������� ��������� PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "�� ��������� ���������� ����� � ������� HTML."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "������������ ��������� � ���������"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "����� ������������ ���������:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "��� �������:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "������ ������� �������������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "���� �������:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "���������"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "��� ����������"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "����������� �����"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "����������� ���� Unix mbox"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "���"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "������������ ���������� ����������� (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "��� ������������:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6368,173 +7391,266 @@ msgstr ""
 "\n"
 "������� \"����.\" ��� ������."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
-msgid "_Edit"
-msgstr "������"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "������."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "�� ������� ������������ � POP ������� �� %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "�� ������� ������������ � POP ������� �� %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "���������� ������� ���� ���������."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"���������� ������� ������� %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "���������� ������� ���� ���������."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "���������� ������� ���� ���������."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "��������� ��������"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "�� ������� ������� ��������� �������: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "��������� �� �����..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "������� � %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "���������� ��������"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "������� ��������� ���������"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "������� � %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "���������� �������� (����� %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "������"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "������� ��������� ���������"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "�������� ����������� ���������"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "������� ������ � ��������"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "����������� ��������� (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "��������� ��� (FIXME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "����������� ��������� (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "��������� ���..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d ������"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "�������� ����������� ���������"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "����"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "��.�����:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "��"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "��������:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "����"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "�����:"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "��������� GPG/PGP �� ���������."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "������������� ��������� �� ������������"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "������������� ���������"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "�������� �� ����������� ��� ����������."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "��� ��������� � �������� ��������, ������� ������ �������� ������������."
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "��� ��������� � �������� ��������, ������� �� ����� ���� ��������� �� "
 "������������."
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "��������� �� FTP ���� (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������� �� ��������� ���� (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "��������� �� FTP ���� (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "�������� \"%s\""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "��������� ����� \"%s\" � ������ \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "�������� ����� \"%s\" � ������ \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "������������� �����"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "�������� ������� �����"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "�������������� ������ ����� � ��������"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "�������� ����� �����"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "����������� ���������"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "�� �� ������ ����������� ��������� �� ���� ����� ��� ������."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "��������� %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6543,7 +7659,7 @@ msgstr ""
 "������ ��� \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6552,101 +7668,105 @@ msgstr ""
 "������ ��� ���������� ��������:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "���������"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "����������� Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "�������� \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "�������� ���������"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�������� ��������� %d �� %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "���������."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "���������� ��������� � �����"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "�����������"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "�����������"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "���������� ����� � \"%s\""
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "�������� �������"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "����������� ���������"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "�������� ��������� %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "�������� ����� \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "������������� �����"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "������������ �����"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "��������� ���������"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "����������� ��������� ����� %d �� %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6655,12 +7775,7 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "���������� ��������� %d �� %d (uid  \"%s\")"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6669,11 +7784,11 @@ msgstr ""
 "������ ���������� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "���������� ��������"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6682,254 +7797,191 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "���������� �������� ������: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "�����"
-
-#: mail/mail-search.c:167
+#: mail/mail-ops.c:2101
 #, c-format
-msgid "Search \"%s\""
-msgstr "����� \"%s\""
+msgid "Disconnecting from %s"
+msgstr ""
 
-#: mail/mail-search.c:169
-msgid "Search Untitled Message"
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
 msgstr "����� ���������������� ���������"
 
-#: mail/mail-search.c:184
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "����� ���������������� ���������"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "������ ���������"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "������ ���������"
+
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "��������� �������"
 
-#: mail/mail-search.c:185
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "����� ���ң�"
 
-#: mail/mail-search.c:192
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "�����:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "����:"
+
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "������..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "��������� � �������� �����"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "���������"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "����������..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "��������..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "��������"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "��������."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "�������� ��������� �������� � �����!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "���� �����"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�� ������� ������� ��������� mbox \"%s\": %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (����������� ���������)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "������.: (��� ����)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "����������� ��������� - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "����������� ��������� (��� ����)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "����������� ���������"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----������������ ���������-----<br><b>��:</b> %s<br><b>����:</b> \"\n"
-"\"%s<br><b>����:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "����������� ���������"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "����.�����"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "����� ����.�����"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "��������"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "�������� ����������� ����� ���������"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "�������� ����"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "�������� ���� ����������� ����� ���������"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "���������"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "��������� ��� ���������"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "����������� ���������� ���������"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "������� ��� ���������"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "����."
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "���������� ���������"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "����."
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "��������� ���������"
-
-#: mail/message-list.c:682
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "�������������"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "�����������"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "��������"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "��������� ��������������� ���������"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "����� ������"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:695
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "�������"
 
-#: mail/message-list.c:696
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "����� �������"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "������� %I:%M %p"
 
-#: mail/message-list.c:962
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:974
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:982
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "���������� ���������"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "����������"
 
-#: mail/message-list.c:1087
-msgid "From"
-msgstr "��"
-
-#: mail/message-list.c:1087
-msgid "Date"
-msgstr "����"
-
-#: mail/message-list.c:1087
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "���������"
 
-#: mail/message-list.c:1088
-msgid "To"
-msgstr "����"
-
-#: mail/message-list.c:1088
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "������"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr ""
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "�����"
 
@@ -6957,15 +8009,1454 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "����������� �� ����� \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "���������� ����������"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "��������� Evolution ��� Executive Summary."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "������� ��� ���������� Executive Summary ��������� Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"���������� ���������������� ��������� Executive Summary ��������� Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "�������"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "�������� �������"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "���� �����"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "��������� Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "��� �������� ����� ��������� �������� ������."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>������ ��� �������� ���������</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "�������� �������"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "�������:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "���� ������ ���������"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "��������"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "���������"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "�������"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "�������:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "����������"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "���������"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "�����"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "����� ������"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "��������"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "����� ������"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "��������"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "�����"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "�������� ��������"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "��������� �����"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "������"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "�������� ������"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "�������� ��������"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "��.�����"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "�������� ������"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "������ ��.�����"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "��������� ��.�����"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "����������� ��������� �������������."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "����������� ������"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "����������� �� �������"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "����"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "�������"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "������ ��������"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "������� ��� ����"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "�������"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "�������� �������"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "������� ��� ����"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "���������"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "���������"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "���"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "������"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "�������"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "�������"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "��������"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "�����"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "��� �������������"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "�������� ����� ������������ �:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "���������� ���������"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "����������"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "�������"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "�����"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "�����"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 ������"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"�������� �������\n"
+"� ����������"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "�������� �������"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "�� ����� ��������� ���̣����� �������"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "�������� �������"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "�������"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"�������:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "�������� ���������"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "�������� Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "������"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "�������� �������"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "����������� �����"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "��������� Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6973,30 +9464,26 @@ msgstr ""
 "���� ����� ������ Evolution ��������� ���������� �������������� �����\n"
 "� ��� ������ ������� Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "���������� ������� \"��\", ����� ���������� ����� ��� \"������\" ��� ������."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "���������� �������� ����� ���������"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "����� Evolution ������� �����������."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "������ �� ��������� Evolution � ������ ���."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "���������� ������� \"��\", ����� ���������� ���������������� ����� Evolution "
 "�"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7007,16 +9494,14 @@ msgstr ""
 "%s\n"
 "������: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"���������� ����������� ����� �\n"
-"\"%s\"."
+msgstr "��� ������ ����� �������� ������."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7027,7 +9512,16 @@ msgstr ""
 "����������, ����������� ���, ����� ���������\n"
 "���������� ����� ������������ Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7038,21 +9532,58 @@ msgstr ""
 "����������, ������� ���, ����� ���������\n"
 "���������� ����� ������������ Evolution."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "�� ������� �������� �����: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"���������� ����������� ����� �\n"
+"\"%s\"."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "���������� ���������� ��������� ��������� -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "����������� � �����"
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"��-��! ���� ��� \"%s\" ���������� ������. :-(\n"
-"�������� ��� ��������, ��� ��������� %s ������."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "����������� � �����"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "������� ����� %s ����"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "�� ������� ��� �� ������ ������� ������� \"%s\"?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "�������� ����� \"%s\""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7061,15 +9592,15 @@ msgstr ""
 "���������� ������� ��������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "��������� ��� ����� �� ���������."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "�������� - ������� ����� �����"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7077,41 +9608,133 @@ msgstr ""
 "��� ��������� ����� �� �������� ���\n"
 "������������ ��������."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "�����..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(��� ���������)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(����� �� ��������)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"�������� ����, ������� �� ������ ������������� � Evolution � �������� ��� "
+"����� �� ������.\n"
+"\n"
+"�� ������ ������� \"��������������\" ���� �� �� ������ � Evolution "
+"���������� �������� ���."
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"�������������� %s\n"
+"�������� �� �����.\n"
+"5 ������ �������� ����� ��������."
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"�������������� %s\n"
+"�������������� �������� %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"��� ���������, ������� �������� ����������\n"
+"%s"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "��������������"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"�������������� %s.\n"
+"������ %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "������ ��� �������� %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "������ ��� �������� %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"�������������� %s\n"
+"�������������� �������� 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "��������������"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "��� �����:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "������� ����"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "��� �����:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "������� �����"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy �� ��� ������ � ����� $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy �� ����� ���� �������."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright (C) 1999-2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7121,31 +9744,88 @@ msgstr ""
 "������� ���������� � ���������� ���������� ���\n"
 "��������� ������ � ����� GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "������� � �����..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "������� ����� ������ ��������"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "�������� � ����"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "�������� ��� ����"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "������ ���������� ��������."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(����� �� ��������)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "���������� ���������� ��������� ��������� -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"��-��! ���� ��� \"%s\" ���������� ������. :-(\n"
+"�������� ��� ��������, ��� ��������� %s ������."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "������� ����� ������ ��������"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "�������� ������:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7154,119 +9834,202 @@ msgstr ""
 "�� ������������� ������ ������� ������\n"
 "\"%s\" �� ������ ��������?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "�� �������"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "������� ��� ������ ��������"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "������� ��� ������ ��������"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "��������� �����������"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "�������� �������� ��� ��������� �����������"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "������� �����������"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "�������� �������� ��� ������� �����������"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "����� ������..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "������� ����� ������ ��������"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "������� ��� ������ ��������"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "������� ��� ������..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "������� ��� ������ ��������"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "������ ������ ��������"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "������ ������ ��������"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "������������"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "������� ��� ������ ��������"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "������� ��� ������ ��������"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "������������ ��� ��������"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�������"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "������� � ����� ����"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "��������� ������� ��������� � ����� ����"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "�������� �������: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "������� ��� ������ ��������"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ��� �������� �� ������ ��������"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "������ ���������� ��������."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "������ ��������"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "��������"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(��� �����)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "��� ������"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "������� ������"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "����� � ����� ��������� ��� ����������"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "��������� ��� ����� �� ��������"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "������ �����/������"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "������������ ����� ��� �������� �����"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "��������� ����� �� �������"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "������� �� ����������� ��� ����� ��������"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "����� � �������"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "�������� �� ��������������"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "��������� ��� �� �������������� ��� ����� ��������"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
-msgid "_View"
-msgstr "��������"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "�������� ��������� �����"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% ����������:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "����� ���� ��������"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "����:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7280,107 +10043,6 @@ msgstr "��� �����:"
 msgid "Specify where to create the folder:"
 msgstr "������� ��� ������� �����:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "�������� Evolution."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"�������� ����, ������� �� ������ ������������� � Evolution � �������� ��� "
-"����� �� ������.\n"
-"\n"
-"�� ������ ������� \"��������������\" ���� �� �� ������ � Evolution "
-"���������� �������� ���."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"�������������� %s\n"
-"�������� �� �����.\n"
-"5 ������ �������� ����� ��������."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"�������������� %s\n"
-"�������������� �������� %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"��� ���������, ������� �������� ����������\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "��������������"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"�������������� %s.\n"
-"������ %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "������ ��� �������� %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "������ ��� �������� %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"�������������� %s\n"
-"�������������� �������� 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "��������������"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "��� �����:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "������� ����"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "��� �����:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "�������������"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7404,26 +10066,36 @@ msgstr ""
 "���� �������� �������� ��� ����� ������� �������\n"
 "������� ������ � Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "�������������"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "�� �������"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "�� ���������� �����"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -7446,7 +10118,7 @@ msgstr ""
 "�� ��������, ��� ��� ���������� ���������� ����� ������� ������ � ��\n"
 "������������ �� ���� �������!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7454,236 +10126,323 @@ msgstr ""
 "� ��������������\n"
 "������� Evolution\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "���������� ���������������� �������� \"��������\"."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "��������� ��������"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "���������� ���������� ����� ���� ����������� � ����."
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�� ������� ���������������� ������������ ������� Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "�����������"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "����������� ���������"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "������� ����� �������"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "������� �������"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "������� ����� �������"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "�����"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "��������"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "����� ��������"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "�������� ���������"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "������� �������"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "����� �������"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "�������� ���������� ���������"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "�����"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "��������"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "�������� ���������"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "�������� ����������� ���������"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "������ ���������"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "������� ���"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "������� �������"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "����"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "���������� ��������"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "����������� ���"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "����������� ��� ��������"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "��������� �������� ����..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "��������"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "��������"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "������..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "����� ���������"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "������� ���"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "�����������"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 ����"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "������ ���������"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "������� ����� ���������� �������"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "������� ����� �������"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "������� ����� ���������"
+msgid "Create a new appointment"
+msgstr "������� ����� �������"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "����"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "������� �"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "������� � �������"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "������� � �������"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "������� � ����"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "������� � ������������ ���"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "������� � ��������� ����"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "������� � ���������� �������"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "�����"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "����� �������"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "������� ���������"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "����."
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "����� �������"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "�������� ����������� ���������"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "���������� ���������"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "���������� ���� ���������"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "��������� ���"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "����������� ����������"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "��������� ��������� ��� ���-������ ���"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "�������� 1 ����"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "�������� 1 �����"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "�������� 1 ������"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "�������� ������� ������"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "�������"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "������� ������"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "������"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "�������"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "��������� �����..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "����"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "�����"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
-msgid "_New"
-msgstr "�����"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "������� ���������"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "������"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "�������"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "������� ��� �������"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "������� ��� �������"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "������� ������ ������������"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "�������� ���������� ���������"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "�������� ������"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "��������� ��������"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "������ ����� ��������"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "������..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "��������� � �������"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "��������� ������� � ������� ���� �������"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "�������� ��� �� %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "��������� �������� ��� ������ �������� ��������"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "��������"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "����"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "������� ���� �������"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "�������..."
 
@@ -7695,27 +10454,12 @@ msgstr "�������"
 msgid "Print En_velope..."
 msgstr "������ ��������..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "������ ����� ��������"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "������..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "��������� ���..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "��������� � �������"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "��������� ������� � ������� ���� �������"
@@ -7732,884 +10476,1004 @@ msgstr "�������� ���������� �������"
 msgid "Send _message to contact..."
 msgstr "������� ��������� � ��������..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
-msgid "_File"
-msgstr "����"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "���������"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "�� ���� ���������"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "� ���������..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "��������"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "������� ���� �������"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "�������� �����... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "��������� ������� � ������� ���� �������"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "��������"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "������� ������� �������..."
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "��������"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "������� ��������� � ��������..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "��������� ����� (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "�������� �������"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "��������"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "�������� �������� ���� �����"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "�������� ���������"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "��������� ��� v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "������� ��� �������"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "��������� ��� ���������"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "����������� � �����... (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "�����������"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"���������\n"
+"�������"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "����������� ���������"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "�������� ������� � ����������"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "��������"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "�������� ������� � ����������"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "�������� ���������"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "��������"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "������� ��� �������"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "���� XML"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "��������"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "���� XML �������� ����������"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "��������� ������� ����"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "������ ������� � ����� (FIXME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "�������"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "��������� (FIXME)"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "������� ����� ���������"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "��������� ��� v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "������� � ���������� ��������"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "������� � ����������� ��������"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "������������� ������� (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "�������� �������"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "�������� �������� �����"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "������ ������"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "����."
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "��������"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "���������� ����������..."
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "�������� ���������"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "����."
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "�������� ������"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "��������� � ��������"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "��������� ������..."
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "��������� ����� �� ������� � �������� ����� �����"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "��������� ��������"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "���������"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "��������� ������� � ������� ���� �������"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "�������� ����������� �����..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "��������� ������� ����"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "�������..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "�������� ������� � ����������"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "�������� ���������"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "�������� � ���������� ������� ���������� ����"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "��������� �����..."
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "������� ���"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "��������"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "������� ���"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "�������� � ���������"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "��������� �������� ��� ������ �������� ��������"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "�������� �������� ���� �����"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "������ ������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "������� ��������� ���������"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "� ���������..."
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "������� ��������� ���������"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
-msgid "_Close"
-msgstr "�������"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "������ ���������� ���������"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:31
-msgid "_Contact (FIXME)"
-msgstr "������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "������ ��������� ���������"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "�����������"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "������ ����������� ���������"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "�������"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "�������"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "�������� ��� ��� �����������"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "�������� ��������� ��������� ��� ��� �����������"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "���������� ������ (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "�������� ���������"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "��������� ������� � ����� (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "�������� ��������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "������� ���"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "����������� � �����... (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "������� ��������"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "��������"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "��������..."
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "������� ��������� ���������"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "������� ���"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "�������� ���"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:44
-msgid "_Task (FIXME)"
-msgstr "������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "������������� ������� (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "�������� ��������� ��������� ��� ��� �����������"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "�������� ������"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "������� ��������� ���������"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "�������� ����� ������ � Executive Summary"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "������ �������� ���������"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "������� ����� ���������"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "����������"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "��������� Executive Summary"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "�����"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "����� ���������"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "�������� ���������"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "��������� ��� ����� ������� � ����� � ���� �����"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "��������..."
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "�������� �������� ���� �����"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "������ �������� ���������"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "�������"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "������� ��������� ���������"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "������� ����� ���������"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "�������� ���� ����������� ����� ���������"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "��������� �����..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "����������� ��������� � ����� �����"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "�������� ����������� ����� ���������"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "������� ����.����� �� ���������"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "������� ��������� ���������"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "�������� ��� ��������� ���������"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "������ ���������"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "������ �������� ���������"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "�������� �������"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "������� ����.����� �� ���������"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "����������"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "������� ����.����� �� ���������"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
-msgstr "������ �� ������ ��������"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "������� ����.����� �� ���������"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
-msgstr "������ �� �����������"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "������� ����.����� �� ���������"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
-msgstr "������ �� ����������"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "�������� ����������� ����� ���������"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
-msgstr "������ �� ����"
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "������� � ���������� ���������"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "������������ ������� ��� ����� ���������� ��� ��������"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "������� ��������� ���������"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "������ ������"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:26
-msgid "Forward As"
-msgstr "��������� ���"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "������� � ����������� ���������"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "��������� ����������"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "������� � ����������� ���������"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "��������� ��������� ����� ����-��"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "������� � ����������� ���������"
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "������ �� ������ ��������"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "������ �� �����������"
+
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
+msgstr "������ �� ����������"
+
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
+msgstr "������ �� ����"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
-"��������� ��� ��������� ����������� � ���� ������, ����� �� ����� ������� ���"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "������ ���������"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "���������"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "������� � ���������� ���������"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Forward As"
+msgstr "��������� ���"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "������� � ����������� ���������"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "��������� ���"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "������ ��������� ���������"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "��������� ����������"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "������ ���������� ���������"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "��������� ����������"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "������ ��������� ���������"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "��������� ��������� ����� ����-��"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "������ ����������� ���������"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "��������� ��������� ����� ����-��"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "�������� ���������"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "��������� ��������� ����� ����-��"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "���������� ����������..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "��������� ��������� ����� ����-��"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "�������� ��� ��� �����������"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "����������� ���������"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "�������� ��� �����������"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "������"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
-msgstr "�������� ��� �������������"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "�������� ��� ������������"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "�������� ��������� ��������� ��� ��� �����������"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "�������� ��������� ��������� ��� ��� �����������"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "�������� ��������� ��������� ��� �ݣ �� �����������"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "�������� ��������� ��������� ��� �ݣ �� �����������"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "�������� ��������� ��������� ��� ��� �����������"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "�����������"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "����������� ��������� � ����� �����"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "������� � ����� ����"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "����."
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "��������� ���������"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "��������� ���������"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "������� ��������"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "��������� ���������"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "��������� ������� ��������� � ����� ����"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "�������� ������ ���������..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "�������� ��������� ��������� ��� ��� �����������"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "����������� ��������� �� ��������"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "�������� ���������� ���������"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "������ ���������..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "����."
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "������������� (FIXME: �� �����������)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "���������� ���������"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "�������� ����"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "���������� ���������"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "�������� �����������"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "���������� ���������"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "����� ���������"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "������ ���������..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "��������"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "�������� ������"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "��������� ��������� � ����� �����"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "������ ���������"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "������� ���"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "��������"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "������� ��������"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "�������� ����"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "��������� � ��������"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "����� ���������"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "������� ����� ���� ��� ������� ��� ���������"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "��������� ��������� � ����� �����"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "������� ���� ������ � ����� �� ��� ��������� ���������"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"��������� ����� �� �������\n"
-" � �������� ����� �����"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "��������� ����� �� ������� � �������� ����� �����"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "������ ���������"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "�������� ���"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "����� ������ ���� � �������: %s"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "������ �������� ���������"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "�������� ����� ����� �� ���� ������"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "������������ ���� � ���������"
+
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "������� ���̣���� ���������� ���������"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "������������"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "����.����� �� ������ ��������"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "�������� ��������� ������ ���������"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "����.����� �� �����������"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr "�������� ����������� �����..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "����.����� �� ����������"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "����.����� �� ����"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "��������� �������"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "��������"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "����������� � �����"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "������� ������ �� ���������"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "����������"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "�������..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:34
-msgid "_Folder"
-msgstr "�����"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "����������� ���������"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "����������"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "���������"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "�������� ���������"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "����������� � �����"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "�������� ���������"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "����������"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "��������� �����..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "����������� ���������"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "������� ���������� ��������"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "����������� ���������"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "���������������"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "������� ��� ����"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "��������"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "��������� ������ ������������..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "����������� ���������"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "���������"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "��������� ��������� ���..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "��������� ������ ������������"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "�������� � ���������"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "�������"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "��������"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "��������"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "������������"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "������� ������� ����"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "������� ��� ���������"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "����������� ��� ��������� � ������� PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "������"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "�������� ��������� ����..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "�������� ���� ��� ����� � ���������"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "�������� ��������� ����..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "������� ����"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "���������� PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "������� PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "��������� ��������"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "���������� PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "��������� � �����... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "���������"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "��������� ���"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "��������� ��������"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "��������� � �����..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "��������� ������� ����"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "��������� ������� ���� ��� ������ ������"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "��������� ��������� � ��������� �����"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "���������"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "��������� �����"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "��������� �����"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "��������� ����� � ������� HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "��������� ��������� �����"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "��������� ��������� ������"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "��������� ��� ��������� ������"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "��������/������ ��������"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "�������� ��������"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "�������� ��������"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "��������� ��� ��������� � ����� PGP-������"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "��������� ��� ��������� � ����� PGP-������"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "����������� ����������� ���� ������� �����"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "����������� ����������� ���� �����"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "����������� ����������� ������ ��� ���� \"��\""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "����������� ����������� ���� \"�����\""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "��������"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "���� ������� �����"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "���� �����"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "�������"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "�������"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "���� \"��\""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "�������� ��������� ����... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "�������..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "���� \"�����\""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "������������"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "�������"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "�������� ����� � ������ ������ ����� ��������"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "�����"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "�������� ������"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "�������� ������ �����"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "������� ����� �� ������ ������ ����� ��������"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "�����������"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "����������"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "��������� ������� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "��������� �����"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "������ ������� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "�������"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "��������� ���������� ��������"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "��������"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "�������� ������"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "�������� ���� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "������� ����� � ��������� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "���������� ������� (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "��������� ������� � ������� ���� �������"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "������ �� �� ������ ��� ���"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "����� ������"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "�����"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "����� �������"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "�������� ��������� ��������"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "������� �������"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
-msgid "_Appointment (FIXME)"
-msgstr "������� (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "�������� ������"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "�������� ��� ����������� (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "�������� (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "������� ���������� ��������"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "������� ����� �������"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "������� �������"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "������� �������"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "����� �������"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "�������� ���������"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "��������� ������� ��� ���-������ ���"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "��������� �������..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "��������� �����..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "�������"
 
@@ -8617,144 +11481,217 @@ msgstr "�������"
 msgid "About Evolution..."
 msgstr "� ���������..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "������� ��� ����"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "��������� ������ ������������..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "������ ��������"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "���������"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "�������� �������� ���� �����"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "��������� ������ ������������"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "����������� � �����"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "�������� ����� �����"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "������� ��� �������� �� ������ ��������"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "�������� ����� �����"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "������� ���� �������"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "�������� ������ �����"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "�����"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "���� Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "������ ������� Evolution"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "����� �� ���������"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "������� �����������"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "������������� �� ������� ������ �����"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "������� ������ ������������"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "������� � ����� ����"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "��������� ������� ��������� � ����� ����"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "�������� ���������� � ��������� Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "��������� ��������� �� ������ ��������� Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "�����������"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "����������� ����������� ������ �����"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "����������� ����������� ������ ��������"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "����������� ������ �/��� ����."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "������������� ���������� ���������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "������������� ���������"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "������������� �����"
 
-#: ui/evolution.xml.h:26
-msgid "Work Offline"
-msgstr "�������� ��� ����"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "�������� ��������� �����"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "� ���������..."
 
-#: ui/evolution.xml.h:28
-msgid "_Actions"
-msgstr "��������"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "������� (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "������� (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "�����������"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "������ �����"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "������� � �����..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "������������� ����..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "������"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "�������� ���������"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "�����������"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "�����"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "����� �����"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "�������..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "������ ��������"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "������ ��������"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "������� (FIXME)"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "�������� ��� ����"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "��������� �����..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "�������� ��������"
 
 #: views/addressbook/galview.xml.h:2
@@ -8785,9 +11722,12 @@ msgstr "���������"
 msgid "With Category"
 msgstr "C ����������:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "�����������������"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8861,69 +11801,136 @@ msgstr "����� ���������� ��������:"
 msgid "All Attendees"
 msgstr "��� �������������"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "������� ��������"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "�������"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "������"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "�������"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "��"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "����� ������ ���� � �������: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "������"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "�������� �������"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "���� ����������"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "�����"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "����������� ������: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "������"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "�������� ���������"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "��������� ���������� ������"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "����������� �����"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "��������� ���..."
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "�������� ���"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "������..."
-
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "�����������..."
@@ -8936,6 +11943,10 @@ msgstr "����������"
 msgid "Warning"
 msgstr "��������������"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "������"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "������"
@@ -8972,3 +11983,616 @@ msgstr "init_corba(): �� ������� ���������������� GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "������ ���������"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "��������� �������..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "��������..."
+
+#~ msgid "_Company:"
+#~ msgstr "��������:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "��� ������������"
+
+#~ msgid "As _Table"
+#~ msgstr "��� �������"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "�����..."
+
+#~ msgid "label26"
+#~ msgstr "�����26"
+
+#~ msgid "Open calendar"
+#~ msgstr "������� ���������"
+
+#~ msgid "Save calendar"
+#~ msgstr "��������� ���������"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>������ �������� ���������:<br>����� �� ��������������"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "�������� ������� ��"
+
+#~ msgid "Colors"
+#~ msgstr "�����"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "��������� ������� ��� ��� "
+
+#~ msgid "Highlight"
+#~ msgstr "������������ ���:"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "������� ������������� �� �������:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "��� �� ������������ �������"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "��� �� ������������ �������:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "������������ �������:"
+
+#~ msgid "TaskPad"
+#~ msgstr "������ �������"
+
+#~ msgid "Time Until Due"
+#~ msgstr "����� �� ������������"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "������� �������"
+
+#~ msgid "Work week"
+#~ msgstr "������� ������"
+
+#~ msgid "Edit Task"
+#~ msgstr "������ �������"
+
+#~ msgid "Percent complete"
+#~ msgstr "������� ������������"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "�������� ������� ��� �����������"
+
+#~ msgid "Edit this task..."
+#~ msgstr "������ ����� �������..."
+
+#~ msgid "Edit the task"
+#~ msgstr "������ �������"
+
+#~ msgid "Go to Today"
+#~ msgstr "�������"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "��������� ������� ��������."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "�� ������� ��������� ��� ���� ���������!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "�� ������� �������� ��� ���� ���������!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "��� ����� �� ����-�� ��� �� ��� ���������!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "�� ������� �������� ��������� ������ ���������."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "�� ������� ������� ��������� ���������!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "��������� ������� ������."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "�� ��������� ���� ��� ���������� ���������."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "�������� � ���������"
+
+#, fuzzy
+#~ msgid " Tentative "
+#~ msgstr "�����������������"
+
+#~ msgid "Update Calendar"
+#~ msgstr "�������� ���������"
+
+#~ msgid "Attendee address"
+#~ msgstr "����� �������������"
+
+#~ msgid "Attendees: "
+#~ msgstr "�������������:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "��������\n"
+#~ "�������"
+
+#~ msgid "Organizer: "
+#~ msgstr "�����������:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "��������� �������"
+
+#~ msgid "_Starting date:"
+#~ msgstr "���� ������:"
+
+#~ msgid "label21"
+#~ msgstr "�����26"
+
+#~ msgid "label55"
+#~ msgstr "�����26"
+
+#~ msgid "Summary contains"
+#~ msgstr "���� ��������"
+
+#~ msgid "Comment contains"
+#~ msgstr "���������� ��������"
+
+#~ msgid "Has category"
+#~ msgstr "����� ���������"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "���������� ��������� ���� ���������� ��� %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "������������ ����� IMAP"
+
+#~ msgid "Inline attachment"
+#~ msgstr "���������� ��������"
+
+#~ msgid "Send as:"
+#~ msgstr "��������� ���:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "���������� ������� ���� ������� %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "��� �� ������� ����."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "���� ���� ����������, �� �� ��������."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "���� �������� ���������, �� ��������� ���� open(2)."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "���� ����� ������� (������ 100�).\n"
+#~ "�� �������, ��� ������ �������� ���?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "���������� ������� HTML ����:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "������� ������"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "������� %s � ������� ����������� ���������� GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "������� %s � ������� ��������� ��������� web ��� GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "��������� ����� %s"
+
+#~ msgid "Run %s"
+#~ msgstr "��������� %s"
+
+#~ msgid "Close %s"
+#~ msgstr "������� %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "����������� %s �����"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "����������� %s ������"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "����������� %s � ���������� ������"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "����������� %s � ��������� ������"
+
+#~ msgid "Appearance"
+#~ msgstr "������� ���"
+
+#~ msgid "Background:"
+#~ msgstr "���:"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "������� ��� ����� RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "���� RDF"
+
+#~ msgid "Factory for the test component."
+#~ msgstr "������� ��� ��������� ����������."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "��������� ������ bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "��������� ������"
+
+#~ msgid "Update automatically"
+#~ msgstr "��������� �������������"
+
+#~ msgid "Forward to Address"
+#~ msgstr "��������� �� ������"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "�������� ����� \"%s\" � ������ \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "�������� ������� �����"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "�������������� ������ ����� � ��������"
+
+#~ msgid "Copying messages"
+#~ msgstr "����������� ���������"
+
+#~ msgid "Evolution progress"
+#~ msgstr "����������� Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "����������� ��������� ����� %d �� %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "���������� ��������� %d �� %d (uid  \"%s\")"
+
+#~ msgid "Search \"%s\""
+#~ msgstr "����� \"%s\""
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "�������� ��������� �������� � �����!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (����������� ���������)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "������.: (��� ����)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "����������� ��������� (��� ����)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----������������ ���������-----<br><b>��:</b> %s<br><b>����:</b> \"\n"
+#~ "\"%s<br><b>����:</b> %s<br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "����������� ���������� ���������"
+
+#~ msgid "Delete this message"
+#~ msgstr "������� ��� ���������"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "����� Evolution ������� �����������."
+
+#~ msgid "Activate"
+#~ msgstr "������������"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "������������ ��� ��������"
+
+#~ msgid "Find"
+#~ msgstr "�����"
+
+#~ msgid "Find a contact"
+#~ msgstr "����� ��������"
+
+#~ msgid "View All"
+#~ msgstr "����������� ���"
+
+#~ msgid "View all contacts"
+#~ msgstr "����������� ��� ��������"
+
+#~ msgid "5 Days"
+#~ msgstr "5 ����"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "������� ����� ���������"
+
+#~ msgid "Day"
+#~ msgstr "����"
+
+#~ msgid "New _Event"
+#~ msgstr "����� �������"
+
+#~ msgid "Open Calendar"
+#~ msgstr "������� ���������"
+
+#~ msgid "Prev"
+#~ msgstr "����."
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "��������� ��������� ��� ���-������ ���"
+
+#~ msgid "Week"
+#~ msgstr "������"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "������� ���������"
+
+#~ msgid "About this application"
+#~ msgstr "�� ���� ���������"
+
+#~ msgid "About..."
+#~ msgstr "� ���������..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "��������"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "�������� �����... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "��������"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "��������� ����� (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "����������� � �����... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "���� XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "���� XML �������� ����������"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "������ ������� � ����� (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "��������� (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "������� � ���������� ��������"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "������� � ����������� ��������"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "������������� ������� (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "����."
+
+#~ msgid "Pre_vious"
+#~ msgstr "����."
+
+#~ msgid "Print S_etup..."
+#~ msgstr "��������� ������..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "�������� � ���������� ������� ���������� ����"
+
+#~ msgid "Select everything"
+#~ msgstr "������� ���"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "������ ������� (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "� ���������..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "������� (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "���������� ������ (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "��������� ������� � ����� (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "�������� ��������� (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "����������� � �����... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "������� (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "������������� ������� (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "�������� ������"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "�������� ����� ������ � Executive Summary"
+
+#~ msgid "Create a new email"
+#~ msgstr "������� ����� ���������"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "��������� Executive Summary"
+
+#~ msgid "New Mail"
+#~ msgstr "����� ���������"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "��������� ��� ����� ������� � ����� � ���� �����"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "��������� �����..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "����������� ��������� � ����� �����"
+
+#~ msgid "Edit the current message"
+#~ msgstr "������ �������� ���������"
+
+#~ msgid "Expunge"
+#~ msgstr "����������"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "������������ ������� ��� ����� ���������� ��� ��������"
+
+#~ msgid "Forward inline"
+#~ msgstr "��������� ����������"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr ""
+#~ "��������� ��� ��������� ����������� � ���� ������, ����� �� ����� ������� ���"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "������ ��������� ���������"
+
+#~ msgid "Invert Selection"
+#~ msgstr "�������� ���������"
+
+#~ msgid "Mark As Read"
+#~ msgstr "�������� ��� �����������"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "�������� ��� �������������"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "����������� ��������� � ����� �����"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "�������� ������ ���������..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "����������� ��������� �� ��������"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "������������� (FIXME: �� �����������)"
+
+#~ msgid "Reply to all"
+#~ msgstr "�������� ����"
+
+#~ msgid "Reply to sender"
+#~ msgstr "�������� �����������"
+
+#~ msgid "S_ource"
+#~ msgstr "��������"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "������� ����� ���� ��� ������� ��� ���������"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "������� ���� ������ � ����� �� ��� ��������� ���������"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "��������� ����� �� �������\n"
+#~ " � �������� ����� �����"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "�������� ��������� ������ ���������"
+
+#~ msgid "_Reply"
+#~ msgstr "��������"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "��������� ��������� ���..."
+
+#~ msgid "_Threaded"
+#~ msgstr "��������"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "��������� � �����... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "��������� ��������� ������"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "�������� ��������� ����... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "��������� ������� (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "������ ������� (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "�������"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "��������� ���������� ��������"
+
+#~ msgid "Replace"
+#~ msgstr "��������"
+
+#~ msgid "Replace a string"
+#~ msgstr "�������� ������"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "�������� ���� (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "������� ����� � ��������� (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "���������� ������� (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "������ �� �� ������ ��� ���"
+
+#~ msgid "Search for a string"
+#~ msgstr "����� ������"
+
+#~ msgid "Undo"
+#~ msgstr "�����"
+
+#~ msgid "Undo the last action"
+#~ msgstr "�������� ��������� ��������"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "�������� ��� ����������� (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "�������� (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "������ ������� Evolution"
diff --git a/po/sk.po b/po/sk.po
index 451e311ba5..1f15ad3adb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10.99\n"
-"POT-Creation-Date: 2001-07-24 17:00+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-24 17:46CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -21,11 +21,11 @@ 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.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Krstn�:      "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  �al�ie: "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "  Pr�pona:     "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "D�tum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Po�tov� schr�nka:"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Pr�p:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "  Regi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "   PS�:  "
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telef�ny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 " Telef�n: "
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Po�t.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "�asov� z�na:"
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Poz�cia: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Vlastn�:"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Vlastn�2: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Vlastn�3: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "  Vlastn�4: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +273,7 @@ msgstr ""
 "\n"
 "Kateg�rie: "
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +299,7 @@ msgstr ""
 "\n"
 "Unik�tny re�azec:"
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -307,11 +307,11 @@ msgstr ""
 "\n"
 "Verejn� k���:"
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -321,9 +321,9 @@ msgstr "VKartapre %s"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nie je mo�n� inicializova� Bonobo"
@@ -337,14 +337,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nena��tan�\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nie je mo�n� spusti� server wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nie je mo�n� spusti� wombat"
 
@@ -416,7 +416,7 @@ msgstr "�iadny (anonymn� m�d)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:66
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr "Heslo"
 
@@ -448,13 +448,14 @@ msgstr "Prip�jacie DN:"
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Pomocn�k pre Bind DN"
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Ulo�i� toto heslo"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Host:"
 msgstr "Hostite�:"
 
@@ -491,7 +492,7 @@ msgid "Advanced LDAP Options"
 msgstr "Pokro�il� mo�nosti LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Cesta:"
 
@@ -503,36 +504,36 @@ msgstr "FIXME Pomocn�k pre Path"
 msgid "Create path if it doesn't exist."
 msgstr "Vytvori� cestu, ak e�te neexistuje."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Upravi� adres�r"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "Prida� adres�r"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr "Vyberte typ adres�ra, ktor� m�te, a zadajte po�adovan� inform�cie."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:56 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Meno:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME Pomocn�k pre Name"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Popis:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Pomocn�k pre Description"
 
@@ -557,20 +558,19 @@ msgstr "URI"
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_Add"
 msgstr "_Prida�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:108 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Upravi�"
 
-#: addressbook/gui/component/addressbook-storage.c:115
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "In� kontakty"
 
@@ -611,7 +611,7 @@ msgstr ""
 "Nebolo mo�n� otvori� tento adres�r. Pros�m, overte, �e cesta\n"
 "existuje a �e m�te dostato�n� pr�va."
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr "�ubovo�n� pole obsahuje"
 
@@ -631,29 +631,20 @@ msgstr "Kateg�ria obsahuje"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktor� zobraz� prehliada� prie�inku"
 
-#.
-#. * 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
-msgid "(none)"
-msgstr "(ni�)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "Prim�rny e-mail"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
 #: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
 #: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -684,7 +675,7 @@ msgstr "Upravi� kontakt"
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 msgid "Add to Contacts"
 msgstr "Prida� do kontaktov"
 
@@ -709,13 +700,13 @@ 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:156
-#: addressbook/gui/component/select-names/e-select-names.c:618
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Odstr�ni�"
 
@@ -727,6 +718,15 @@ msgstr "Odstr�ni� v�etky"
 msgid "Send HTML Mail?"
 msgstr "Posla� po�tu HTML?"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Zmenen� kontakt:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
 msgstr "Adres�ti spr�vy"
@@ -832,9 +832,9 @@ msgstr "_Kontakty..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1205
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1302
-#: mail/mail-config.glade.h:107 ui/evolution-mail-message.xml.h:79
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Odstr�ni�"
@@ -887,95 +887,95 @@ msgstr "_Toto je e-mailov� adresa"
 msgid "Delete Contact?"
 msgstr "Odstr�ni� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patr� do t�chto kateg�ri�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 #: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Pr�ca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Pr�ca 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
 #: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Pracovn� fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Sp�tn� volanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 #: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Dom�ci fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
 #: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "In�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "�al�� fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
 #: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Prim�rny"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
 #: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
 #: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
@@ -1138,19 +1138,24 @@ msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Add Anyway"
+msgstr "_Prida� aj tak"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "N�jden� duplik�t kontaktu"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
 msgstr "Nov� kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
 msgstr "P�vodn� kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: 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?"
@@ -1158,10 +1163,6 @@ msgstr ""
 "Meno alebo e-mail pre tento kontakt u� v tomto prie�inku\n"
 "existuje. Chcete ho aj tak prida�?"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:6
-msgid "_Add Anyway"
-msgstr "_Prida� aj tak"
-
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Zmenen� kontakt:"
@@ -1314,9 +1315,9 @@ msgstr "Posla� spr�vu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:55
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tla�i�"
 
@@ -1328,9 +1329,9 @@ msgstr "Tla�i� ob�lku"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:27 ui/evolution-addressbook.xml.h:8
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Odstr�ni�"
 
@@ -1345,7 +1346,7 @@ msgid "Success"
 msgstr "�spech"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:250 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Nezn�ma chyba"
 
@@ -1712,18 +1713,18 @@ msgstr "��rka:"
 msgid "_Font..."
 msgstr "_P�smo..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Chyba pri komunik�cii s kalend�rov�m serverom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 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:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je mo�n� pre��ta� blok aplik�cie ToDo pilota"
 
@@ -1759,6 +1760,11 @@ msgstr "Vytv�racie rozhranie pre ovl�dac� prvok poh�adu iTip kalend�ra"
 msgid "Factory for the sample Calendar control"
 msgstr "Vytv�racie rozhranie pre uk�kov� ovl�dac� prvok Kalend�r."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Vytv�racie rozhranie pre komponent Kalend�r Evolution."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Slu�ba upozor�ovania na poplachy"
@@ -1865,127 +1871,151 @@ msgstr "Nie je mo�n� inicializova� gnome-vfs"
 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:278
-msgid "File not found"
-msgstr "S�bor nen�jden�"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:302
-msgid "Open calendar"
-msgstr "Otvori� kalend�r"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
-msgid "Save calendar"
-msgstr "Ulo�i� kalend�r"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:597
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:586
+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:375 calendar/gui/calendar-model.c:981
-#: calendar/gui/e-calendar-table.c:346
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Verejn�"
 
-#: calendar/gui/calendar-model.c:378 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:347
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "S�kromn�"
 
-#: calendar/gui/calendar-model.c:381 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Tajn�"
 
-#: calendar/gui/calendar-model.c:384 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Nezn�my"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:483
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:483
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1166
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Vysok�"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1168
-#: calendar/gui/calendar-model.c:1691
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Norm�lny"
 
-#: calendar/gui/calendar-model.c:525 calendar/gui/calendar-model.c:1170
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "N�zka"
 
-#: calendar/gui/calendar-model.c:561 calendar/gui/calendar-model.c:1222
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Prieh�adn�"
 
-#: calendar/gui/calendar-model.c:564 calendar/gui/calendar-model.c:1224
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Neprieh�adn�"
 
-#: calendar/gui/calendar-model.c:718 calendar/gui/calendar-model.c:1276
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Neza�al"
 
-#: calendar/gui/calendar-model.c:721 calendar/gui/calendar-model.c:1278
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1280
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Dokon�en�"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1282
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Zru�en�"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:877 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:880 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1996,25 +2026,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:965
-msgid "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Klasifik�cia mus� by� 'Verejn�', 'S�kromn�', 'Tajn�' alebo '�iadna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:979 calendar/gui/calendar-model.c:1220
-#: calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
-#: mail/mail-account-gui.c:1364 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:59
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
 #: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "�iadna"
 
-#: calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2024,38 +2056,42 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1110
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentu�lna hodnota mus� by� medzi 0 a� 100"
 
-#: calendar/gui/calendar-model.c:1151
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Priorita mus� by� 'Vysok�', 'Norm�lna', 'N�zka' alebo 'Nedefinovan�'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1164
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Nedefinovan�"
 
-#: calendar/gui/calendar-model.c:1205
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prieh�adnos� mus� by� 'Prieh�adn�', 'Neprieh�adn�' alebo '�iadne'."
 
-#: calendar/gui/calendar-model.c:1693
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1695
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Priraden�"
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "�no"
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nie"
 
@@ -2275,7 +2311,7 @@ msgstr "koniec sch�dzky"
 msgid "hour(s)"
 msgstr "hod�n"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:109
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "min�t"
 
@@ -2317,7 +2353,6 @@ msgstr "P�pnu� pri zobrazen� okna alarmu."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Kalend�r"
 
@@ -2350,7 +2385,7 @@ msgid "Defaults"
 msgstr "�tandard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Zobrazenie"
 
@@ -2367,7 +2402,7 @@ msgid "Fri"
 msgstr "Pia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Piatok"
 
@@ -2376,7 +2411,7 @@ msgid "Mon"
 msgstr "Pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -2397,7 +2432,7 @@ msgid "Sat"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -2418,7 +2453,7 @@ msgid "Sun"
 msgstr "Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Nede�a"
 
@@ -2435,7 +2470,7 @@ msgid "Thu"
 msgstr "�tv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:977
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "�tvrtok"
 
@@ -2460,7 +2495,7 @@ msgid "Tue"
 msgstr "Ut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -2469,7 +2504,7 @@ msgid "Wed"
 msgstr "Str"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:976
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -2542,27 +2577,27 @@ 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:154
-#: calendar/gui/e-itip-control.c:618 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr "u do "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:622 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Dokon�en� "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:624 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Dokon�en� "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:629 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Term�n do "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Term�n do "
 
@@ -2589,12 +2624,12 @@ msgstr "Polo�ka denn�ka - %s"
 msgid "No summary"
 msgstr "�iadny s�hrn"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1468
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "Prep�sa� s�bor?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1472
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2604,7 +2639,7 @@ msgstr ""
 "Prep�sa� ho?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Ulo�i� ako..."
 
@@ -2672,7 +2707,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Pomocou �av�ho tla�idla my�i m��ete zv��i� oblas� mapy a vybra� �asov� z�nu.\n"
+"Pomocou �av�ho tla�idla my�i m��ete zv��i� oblas� mapy a vybra� �asov� "
+"z�nu.\n"
 "Pre zmen�enie pou�ite prav� tla�idlo my�i."
 
 #: calendar/gui/dialogs/event-editor.c:154
@@ -2735,11 +2771,135 @@ msgstr "�as _konca:"
 msgid "_Start time:"
 msgstr "�as _za�iatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:623
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Meno skupiny:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Zdroj"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Auto"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Povinn� inform�cie"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Nepovinn� inform�cie"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Vyberte akciu"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Odstr�nen�"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Predbe�n�"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Odstr�nen�"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Prebieha"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telef�n v aute"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Povinn� inform�cie"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Nepovinn� inform�cie"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Poslan�:"
 
-#: calendar/gui/dialogs/meeting-page.c:1200
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Delegova� na..."
 
@@ -2776,13 +2936,13 @@ msgid "Role"
 msgstr "Rola"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Stav"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:100
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -2805,32 +2965,32 @@ msgstr "_Pozva� ostatn�ch"
 msgid "_Other Organizer"
 msgstr "_In� organiz�tor"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 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:947
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "zapnut�"
 
-#: calendar/gui/dialogs/recurrence-page.c:973 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "de�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1111
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1281
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "v�skytov"
 
@@ -2923,7 +3083,7 @@ msgid "No one"
 msgstr "�iadna"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2956,104 +3116,106 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/e-calendar-table.c:390
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:391
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:393
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:886
-msgid "Edit this task"
-msgstr "Upravi� t�to �lohu"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Otvori�"
 
-#: calendar/gui/e-calendar-table.c:887 calendar/gui/e-calendar-table.c:897
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Vystrihn��"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:888 calendar/gui/e-calendar-table.c:898
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kop�rova�"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kop�rova�"
 
-#: calendar/gui/e-calendar-table.c:889 calendar/gui/e-calendar-table.c:899
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Vlo�i�"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Vlo�i�"
 
-#: calendar/gui/e-calendar-table.c:891
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Ozna�i� ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:892
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Odstr�ni� t�to �lohu"
 
-#: calendar/gui/e-calendar-table.c:901
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Ozna�i� �lohy ako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:902 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Odstr�ni� vybran� �lohy"
 
-#: calendar/gui/e-calendar-table.c:1259
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Kliknut�m prid�te �lohu"
 
@@ -3127,13 +3289,6 @@ msgstr "%02i rozdelen� min�ty"
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-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:1357
@@ -3153,122 +3308,124 @@ msgstr "dopoludnia"
 msgid "pm"
 msgstr "popoludn�"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nov� sch�dzka"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nov� celodenn� udalos�"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "Prejs� na dne�n� d�tum"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Prejs� na d_ne�n� d�tum"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Prejs� na d�tum..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Otvori�"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Odstr�ni� t�to sch�dzku"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Nastavi� tento v�skyt ako presunute�n�"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Odstr�ni� tento v�skyt"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Odstr�ni� v�etky v�skyty"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Toto je udalos�, ktor� je mo�n� prida� do v�ho kalend�ra."
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Toto je po�iadavka na sch�dzku."
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Toto je jedna, alebo viacero �prav aktu�lnej sch�dzky."
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Toto je po�iadavka na najnov�ie inform�cie o udalosti."
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Toto je odpove� na po�iadavku na sch�dzku."
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Toto je zru�enie udalosti."
 
-#: calendar/gui/e-itip-control.c:703 calendar/gui/e-itip-control.c:743
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "T�to spr�va nie je k zrozumite�n�."
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Toto je �loha, ktor� je mo�n� prida� do v�ho kalend�ra."
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Toto je po�iadavka na �lohu."
 
-#: calendar/gui/e-itip-control.c:734
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Toto je po�iadavka na najnov�ie inform�cie o �lohe."
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Toto je odpove� na po�iadavku na �lohu."
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Toto je zru�enie �lohy."
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Toto je inform�cia o vo�nom �ase."
 
-#: calendar/gui/e-itip-control.c:765
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Toto je po�iadavka na inform�ciu o vo�nom �ase."
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Toto je odpove� na po�iadavku na vo�n� �as."
 
-#: calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Spr�va vyzer� ako nespr�vna"
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Spr�va obsahuje iba nepodporovan� po�iadavky."
 
-#: calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Inform�cia obsiahnut� v tento pr�lohe nie je platn�"
 
-#: calendar/gui/e-itip-control.c:978
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nie je mo�n� aktualizova� v� s�bor s kalend�rom!\n"
 
-#: calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1015
 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"
 
@@ -3309,21 +3466,21 @@ msgstr "d�tum konca"
 msgid "date-start"
 msgstr "d�tum za�iatku"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "V�etky"
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kateg�ria:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa na��ta� �lohy v `%s'"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
@@ -3336,36 +3493,17 @@ msgstr "Met�dy potrebn� pre na��tanie `%s' nie je podporovan�"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nov� sch�dzka..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Odstr�ni� v�etky v�skyty"
-
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "S�hrn obsahuje"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "Koment�r obsahuje"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "M� kateg�riu"
-
-#: calendar/gui/gnome-cal.c:1058
+#: calendar/gui/gnome-cal.c:999
 #, 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:1069
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Met�da nutn� k otvoreniu `%s' nie je podporovan�"
@@ -3426,7 +3564,7 @@ msgstr "September"
 msgid "_Go To Today"
 msgstr "_Prejs� na dne�n� d�tum"
 
-#: calendar/gui/itip-utils.c:223
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr "Organiz�tor mus� by� nastaven�."
 
@@ -3590,7 +3728,8 @@ msgstr "�lohy"
 
 #. Day
 #: calendar/gui/print.c:1815
-msgid "Current day (%a %b %d %Y)"
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Dnes (%a %b %d %Y)"
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
@@ -3602,18 +3741,20 @@ msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
 #: calendar/gui/print.c:1846
-#, c-format
-msgid "Current week (%s - %s)"
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Tento t��de� (%s - %s)"
 
 #. Month
 #: calendar/gui/print.c:1854
-msgid "Current month (%b %Y)"
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Tento mesiac (%b - %Y)"
 
 #. Year
 #: calendar/gui/print.c:1861
-msgid "Current year (%Y)"
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Tento rok (%Y)"
 
 #: calendar/gui/print.c:2200
@@ -3621,8 +3762,8 @@ msgid "Print Calendar"
 msgstr "Tla�i� kalend�r"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1829 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Uk�ka pred tla�ou"
@@ -3635,7 +3776,7 @@ msgstr "Tla�i� polo�ku"
 msgid "Print Setup"
 msgstr "Nastavenie tla�iarne"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktor� bude zobrazova� prie�inok �loh"
 
@@ -3743,7 +3884,6 @@ msgid "Unable to process spool folder"
 msgstr "Nie je mo�n� spracova� prie�inok fronty"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Z�skavam spr�vu %d (%d%%)"
 
@@ -4005,7 +4145,7 @@ msgstr "(nezn�my hostite�)"
 
 #: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
 #: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:296
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Oper�cia zru�en�"
 
@@ -4086,7 +4226,8 @@ msgstr "Spr�va challenge pre server neplatn�\n"
 
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Spr�va challenge pre server obsahovala neplatn� prvok \"Kvalita ochrany\"\n"
+msgstr ""
+"Spr�va challenge pre server obsahovala neplatn� prvok \"Kvalita ochrany\"\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -4128,7 +4269,8 @@ msgstr "Prihl�senie NT"
 
 #: 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 "T�to vo�ba pripoj� na server pomocou hesiel pren�an�ch ako �ist� text."
+msgstr ""
+"T�to vo�ba pripoj� na server pomocou hesiel pren�an�ch ako �ist� text."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -4296,26 +4438,26 @@ msgstr "�iadna tak� spr�va: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nem��ete skop�rova� spr�vy z tohto prie�inku s odpadkami."
 
-#: camel/providers/imap/camel-imap-command.c:241
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neo�ak�van� odpove� od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-command.c:249
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP pr�kaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Odpove� serveru skon�ila pr�li� skoro."
 
-#: camel/providers/imap/camel-imap-command.c:507
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpove� IMAP serveru neobsahovala inform�ciu %s"
 
-#: camel/providers/imap/camel-imap-command.c:544
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neo�ak�van� odpove� OK od IMAP serveru: %s"
@@ -4334,16 +4476,28 @@ msgstr "Nie je mo�n� na��ta� s�hrn pre %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "Prie�inok bol zni�en� a znovu vytvoren� na serveri."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "Prech�dzam prie�inok IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Uklad�m %d spr�v"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1769
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 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:1802
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Prech�dzam prie�inky v \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je mo�n� n�js� telo spr�vy v odpovedi FETCH."
 
@@ -4352,7 +4506,7 @@ msgstr "Nie je mo�n� n�js� telo spr�vy v odpovedi FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nie je mo�n� otvori� prie�inok pre vyrovn�vaciu pam�: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Kontrolujem nov� po�tu"
 
@@ -4378,7 +4532,8 @@ msgstr "Priestor mien"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Aplikova� filtre na nov� spr�vy v prie�inku novej po�ty na tomto serveri"
+msgstr ""
+"Aplikova� filtre na nov� spr�vy v prie�inku novej po�ty na tomto serveri"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
@@ -4390,7 +4545,8 @@ msgstr "Pre ��tanie a ukladanie po�ty na IMAP serveroch."
 
 #: camel/providers/imap/camel-imap-provider.c:82
 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."
+msgstr ""
+"T�to vo�ba pripoj� na IMAP server pomocou hesiel pren�an�ch ako �ist� text."
 
 #: camel/providers/imap/camel-imap-store.c:463
 #, c-format
@@ -4956,7 +5112,7 @@ msgstr "Necha� po�tu na serveri"
 msgid "Delete after %s day(s)"
 msgstr "Odstr�ni� po %s d�och"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:65
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4988,7 +5144,8 @@ msgstr ""
 "tento protokol podporuje."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+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
@@ -5048,7 +5205,7 @@ msgid "No such folder `%s'."
 msgstr "Prie�inok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5100,7 +5257,7 @@ msgstr "sendmail"
 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:80
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5154,7 +5311,8 @@ msgstr "Pou��vate� nie je lok�lny, bude predan� pod�a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
+msgstr ""
+"Po�adovan� po�tov� akcia nevykonan�, po�tov� schr�nka nie je k dispoz�cii"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
@@ -5382,7 +5540,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "pr�loha"
 
@@ -5491,29 +5649,29 @@ msgstr ""
 "Chyba pri ��tan� s�boru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Ulo�i� ako..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "S�bor existuje, prep�sa� ho?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladan� s�boru: %s"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri na��tavan� s�boru: %s"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5521,16 +5679,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:1043
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri pr�stupe k s�boru: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je mo�n� z�ska� spr�vu z editora"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5539,7 +5697,7 @@ msgstr ""
 "Nepodarilo sa h�ada� v s�bore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5548,7 +5706,7 @@ msgstr ""
 "Nepodarilo sa skr�ti� s�bor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5557,7 +5715,7 @@ msgstr ""
 "Chyba pri automatickom ukladan� spr�v: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5565,7 +5723,7 @@ msgstr ""
 "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:1317
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5575,24 +5733,24 @@ msgstr ""
 "\n"
 "Chcete ulo�i� zmeny?"
 
-#: composer/e-msg-composer.c:1324 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:215
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Otvori� s�bor"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Vlo�i� s�bor"
 
-#: composer/e-msg-composer.c:1852 composer/e-msg-composer.c:2241
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Nap�sa� spr�vu"
 
-#: composer/e-msg-composer.c:2335
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nie je mo�n� vytvori� okno editora spr�v."
 
@@ -5818,7 +5976,7 @@ msgstr ""
 "Pros�m, vr�te sa a zadajte platn� prie�inok, kam doru�i� po�tu."
 
 #: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:768
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Vybra� prie�inok"
 
@@ -5879,14 +6037,14 @@ msgstr "prijat�"
 msgid "outgoing"
 msgstr "odoslan�"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:7
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "Prida�"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Upravi�"
 
@@ -6007,124 +6165,120 @@ msgid "Expression"
 msgstr "V�raz"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Preda� �alej na adresu"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "D�le�it�"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "je viac ne�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "je menej ne�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nie je"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Telo spr�vy"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Hlavi�ka spr�vy"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Spr�va bola prijat�"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Spr�va bola odoslan�"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Presun�� do prie�inku"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "d�a a po"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "d�a a pred"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Pre��tan�"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Adres�ti"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regul. v�raz"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Odpovedan�"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Odosielate�"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Nastavi� stav"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Ve�kos� (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "vyzer� ako"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Zdrojov� ��et"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "�pecifick� hlavi�ka"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "za��na na"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Zastavi� spracovanie"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:860
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "bolo po"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "bolo pred"
 
@@ -6248,11 +6402,21 @@ msgstr "Rozhranie pre nastavenie po�ty"
 msgid "This folder cannot contain messages."
 msgstr "Tento prie�inok nem��e obsahova� spr�vy."
 
-#: mail/component-factory.c:727
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Vlastnosti..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Zmen� vlastnosti tohto prie�inku"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je mo�n� inicializova� po�tov� komponent Evolution."
 
-#: mail/component-factory.c:864
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Nie je mo�n� zaregistrova� sklad u shellu"
 
@@ -6265,134 +6429,130 @@ msgstr "Vlastnosti \"%s\""
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je mo�n� vytvori� do�asn� prie�inok: %s"
 
-#: mail/folder-browser.c:889
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Ulo�i� h�adanie ako vPrie�inok"
 
-#: mail/folder-browser.c:1234
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "Vprie�inok na _predmet"
 
-#: mail/folder-browser.c:1237
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "Vprie�inok na _odosielate�a"
 
-#: mail/folder-browser.c:1240
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "Vprie�inok na _adres�tov"
 
-#: mail/folder-browser.c:1243
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VPrie�inok na _konferenciu"
 
-#: mail/folder-browser.c:1249
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1252
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielate�ovi"
 
-#: mail/folder-browser.c:1255
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adres�toch"
 
-#: mail/folder-browser.c:1258
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1267
-msgid "_Open"
-msgstr "_Otvori�"
-
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Znovuposla�"
 
-#: mail/folder-browser.c:1271 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:87 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Ulo�i� _ako..."
 
-#: mail/folder-browser.c:1273 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Tla�i�"
 
-#: mail/folder-browser.c:1278 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Odpoveda� odosielate�ovi"
 
-#: mail/folder-browser.c:1280 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odpoveda� _zoznamu"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odpoveda� _v�etk�m"
 
-#: mail/folder-browser.c:1284
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "Posla� �_alej"
 
-#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Ozna�i� ako _pre��tan�"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Ozna�i� ako _nepre��tan�"
 
-#: mail/folder-browser.c:1291
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "Ozna�i� ako _d�le�it�"
 
-#: mail/folder-browser.c:1293
+#: mail/folder-browser.c:1297
 msgid "Mark as Unim_portant"
 msgstr "Ozna�i� ako ned�_le�it�"
 
-#: mail/folder-browser.c:1298
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Pre_sun�� do prie�inka..."
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kop�rova� do prie�inku..."
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "Obnovi� _zmazan�"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Prida� odosielate�a do adres�ra"
 
-#: mail/folder-browser.c:1314
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Pou�i� filtre"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Vytvori� pra_vidlo zo spr�vy"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VPrie�inok na konferenciu"
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPrie�inok na konferenciu (%s)"
@@ -6461,11 +6621,11 @@ msgstr "Editor diskusn�ch skup�n Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor ��tov Evolution"
 
-#: mail/mail-account-gui.c:958
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Ulo�i� podpis"
 
-#: mail/mail-account-gui.c:964
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6483,7 +6643,7 @@ msgstr " (�tandard)"
 msgid "Disable"
 msgstr "Zak�za�"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Povoli�"
 
@@ -6503,7 +6663,7 @@ msgstr "Naozaj odstr�ni� ��et?"
 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 OK button and title
+#. give our dialog an Close button and title
 #: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Spr�vca ��tov Evolution"
@@ -6591,29 +6751,29 @@ msgstr "Mus�te zada� adres�tov pre poslanie tejto spr�vy."
 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:656
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "V %s, %s zap�san�:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Predan� spr�va:\n"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Presun�� spr�vu do"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kop�rova� spr�vu do"
 
-#: mail/mail-callbacks.c:1345
+#: mail/mail-callbacks.c:1374
 #, 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:1367
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6621,7 +6781,7 @@ msgstr ""
 "Upravova� m��ete iba spr�vy ulo�en�\n"
 "v prie�inku Koncepty."
 
-#: mail/mail-callbacks.c:1401
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6629,24 +6789,24 @@ msgstr ""
 "Iba spr�vy z prie�inku Odoslan� je mo�n�\n"
 "znovu posla�."
 
-#: mail/mail-callbacks.c:1413
+#: mail/mail-callbacks.c:1442
 #, 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:1434
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "�iadna vybran� spr�va"
 
-#: mail/mail-callbacks.c:1516
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Ulo�i� spr�vu ako..."
 
-#: mail/mail-callbacks.c:1518
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Ulo�i� spr�vy ako..."
 
-#: mail/mail-callbacks.c:1731
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6655,19 +6815,19 @@ msgstr ""
 "Chyba pri na��tavan� inform�cie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1741
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Tla�i� spr�vu"
 
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Tla� spr�vy zlyhala"
 
-#: mail/mail-callbacks.c:1931
+#: mail/mail-callbacks.c:1966
 #, 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?"
@@ -6719,7 +6879,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Sprievodca ��tom Evolution"
 
-#: mail/mail-config.c:1560 mail/mail-config.c:1563
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Prip�jam sa na server..."
 
@@ -6732,58 +6892,63 @@ msgid " color"
 msgstr " farba"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Digit�lny podpis nie je podporovan� touto �ifrou"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "��et"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Inform�cia o ��te"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Spr�va ��tu"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "��ty"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "V�dy �ifrova� k�piu sebe pri posielan� �ifrovanej spr�vy"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "V�dy �ifrova� k�piu sebe pri posielan� �ifrovanej spr�vy"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "V�dy na��tava� obr�zky zo siete"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pr�loha"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Typ overenia:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automaticky kontrolova� po�tu ka�d�ch"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID certifik�tu:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Editor"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6799,264 +6964,269 @@ msgstr ""
 "\n"
 "Kliknut�m na \"Dokon�i�\" ulo��te va�e nastavenie."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "�_tandardn�"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "�tandardn� �t�l \"Preda� �alej\" je: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "�tandardn� znakov� sada:"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "Digit�lne IDs..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Prie�inok konceptov:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Upravi�..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-mailov� adresa:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "Vypr�zdni� prie�inky na Odpadky pri ukon�en�"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Povoli�"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Cel� meno:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Z�ska� digit�lne ID..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "HTML podpis:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Zv�razni� cit�cie pomocou"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "v HTML po�te"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Na��ta� obr�zky ak je odosielate� v adres�ri"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Nastavenie po�ty"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Mailbox location"
 msgstr "Umiestnenie po�tovej schr�nky"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Pou�i� ho ako �tandardn� ��et"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Mark messages as Read after"
 msgstr "Ozna�i� spr�vy ako \"Pre��tan�\" po"
 
-#: mail/mail-config.glade.h:53
-msgid "Message list should display in a threaded fasion by default"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Message list should display in a threaded fashion by default"
 msgstr "�tandardne zobrazova� spr�vy ako vl�kna"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Message preview should be displayed by default"
 msgstr "�tandardne zobrazova� n�h�ad spr�vy"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Nikdy nena��ta� obr�zky zo siete"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Diskusn� skupiny"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Nepovinn� inform�cie"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organiz�cia:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "ID PGP k���a:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Cesta k spustite�n�mu s�boru PGP:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Prompt when sending messages with an empty subject"
 msgstr "P�ta� sa pri posielan� spr�v bez predmetu"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Prompt when sending messages with only Bcc recipients defined"
 msgstr "P�ta� sa pri posielan� spr�v s adres�tmi iba v Bcc"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Citova�"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Pr�jem po�ty"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Prij�mam po�tu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Mo�nosti pr�jmu"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr "Pam�ta� si heslo PGP pri ukon�en�"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Povinn� inform�cie"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "Bezpe�n� MIME"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Bezpe�nos�"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Posiela� �tandardne ako HTML."
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Posielanie po�ty"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Posielanie po�ty"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Odoslan�"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Odoslan� a koncepty"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Prie�inok pre odoslan� spr�vy:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server vy�aduje overenie"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "S�bor s podpisom:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Inform�cia o zdrojovom k�de"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "�peci�lne prie�inky"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "�tandardn� Unixov� s�bor mbox"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Pou�i� bezpe�n� pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Meno pou��vate�a:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -7066,15 +7236,15 @@ msgstr ""
 "\n"
 "Kliknut�m \"�al��\" za�neme."
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "miesto"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "sek�nd."
 
@@ -7114,53 +7284,53 @@ msgstr "Nepodarilo sa vytvori� kontext ob�lky S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvori� kontext dek�dovania S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Ulo�i� pr�lohu"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Ulo�i� na disk..."
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Zobrazi� v texte"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori� v %s..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobrazi� v text (pomocou %s)"
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skry�"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr "Extern� zobrazova�"
 
-#: mail/mail-display.c:1047
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Na��tavam obsah spr�vy"
 
-#: mail/mail-display.c:1403
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Otvori� odkaz v prehliada�i"
 
-#: mail/mail-display.c:1405
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Kop�rova� umiestnenie odkazu"
 
-#: mail/mail-display.c:1407
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Ulo�i� odkaz ako"
 
-#: mail/mail-display.c:1409
+#: mail/mail-display.c:1410
 msgid "Save Image as..."
 msgstr "Ulo�i� obr�zok ako..."
 
@@ -7188,94 +7358,104 @@ msgstr "%d neposlan�ch"
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/mail-format.c:602
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s pr�loha"
 
-#: mail/mail-format.c:651
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je mo�n� spracova� spr�vu MIME. Zobrazujem ako zdrojov� k�d."
 
-#: mail/mail-format.c:733 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:849 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-mailov� adresa:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1181
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Nenastaven� �iadny program GPG/PGP."
 
-#: mail/mail-format.c:1196
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Za�ifrovan� spr�va nie je zobrazen�"
 
-#: mail/mail-format.c:1202
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Za�ifrovan� spr�va"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre de�ifrovanie."
 
-#: mail/mail-format.c:1259
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "T�to spr�va je digit�lne podp�san� a podpis je platn�."
 
-#: mail/mail-format.c:1267
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "T�to spr�va je digit�lne podp�san� ale podpis nie je platn�."
 
-#: mail/mail-format.c:1921
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1933
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lok�lny s�bor (%s) platn� na serveri \"%s\""
 
-#: mail/mail-format.c:1937
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lok�lny s�bor (%s)"
 
-#: mail/mail-format.c:1971
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Odkaz na FTP server (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na nezn�me extern� d�ta (typ \"%s\")"
 
-#: mail/mail-format.c:1976
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Nespr�vna �as� extern�ho tela."
 
-#: mail/mail-local.c:452
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otv�ram '%s'"
 
-#: mail/mail-local.c:741
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Men� prie�inok \"%s\" na form�t \"%s\""
 
-#: mail/mail-local.c:862
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7284,7 +7464,7 @@ msgstr ""
 "Nie je mo�n� ulo�i� metainform�cie do prie�inku, asi zist�te,\n"
 "�e ho nie je mo�n� ani otvori�: %s"
 
-#: mail/mail-local.c:901
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7292,16 +7472,16 @@ msgstr ""
 "Ak nem��ete otvori� t�to po�tov� schr�nku, potom\n"
 "ju budete musie� opravi� ru�ne."
 
-#: mail/mail-local.c:994
+#: mail/mail-local.c:1000
 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:1005
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znovu nastavi� %s"
 
-#: mail/mail-mt.c:184
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7310,7 +7490,7 @@ msgstr ""
 "Chyba po�as '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7319,7 +7499,7 @@ msgstr ""
 "Chyba pri vykon�van� oper�cie:\n"
 "%s"
 
-#: mail/mail-mt.c:719
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Pracujem"
 
@@ -7438,7 +7618,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Uklad�m pr�lohu"
 
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7447,12 +7627,12 @@ msgstr ""
 "Nepodarilo sa vytvori� v�stupn� s�bor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2030
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je mo�n� zap�sa� d�ta: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
@@ -7517,36 +7697,29 @@ msgstr "Posielam"
 msgid "Cancelled."
 msgstr "Zru�en�."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Pou��vate� zru�il oper�ciu."
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nie je mo�n� vytvori� do�asn� po�tov� schr�nku `%s': %s"
 
-#: mail/mail-tools.c:212
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: �iadny predmet]"
-
-#: mail/mail-tools.c:229
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predan� spr�va - %s"
 
-#: mail/mail-tools.c:231
-msgid "Forwarded message (no subject)"
-msgstr "Predan� spr�va (bez predmetu)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Spr�vy predan� �alej"
 
-#: mail/mail-tools.c:452
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Spr�va poslan� �alej-----<br><b>Od:</b> %s<br><b>Komu:</b> %"
-"s<br><b>Predmet:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Spr�vy predan� �alej"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7620,11 +7793,11 @@ msgstr "%b %d %Y"
 msgid "Updating message list"
 msgstr "Aktualizujem zoznam spr�v"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Vyzna�en�"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Prijat�"
 
@@ -7696,31 +7869,32 @@ msgstr "%a %l:%M%p"
 msgid "Mail summary"
 msgstr "S�hrn po�ty"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo d�a"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "Cit�t d�a"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Prida� nov� kan�l spr�v"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 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:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "Nastavenie pre Moje Evolution"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Nastala chyba po�as na��tavania kan�la spr�v.</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b> Chyba na��tavania RDF</b>"
 
@@ -7756,38 +7930,6 @@ msgstr "Tla� Mojej Evolution zlyhala"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent s�hrnu nemohol inicializova� Bonobo.\n"
 
-#: my-evolution/metar.c:29
-msgid "�F"
-msgstr "�F"
-
-#: my-evolution/metar.c:29
-msgid "�C"
-msgstr "�C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "uzlov"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "m��"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometrov"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Jasn� obloha"
@@ -9035,14 +9177,10 @@ msgid "Weather settings"
 msgstr "Nastavenie po�asia"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "Vy�isti� sledova�e"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "imperi�lne"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metrick�"
 
@@ -9058,6 +9196,11 @@ msgstr "Zobrazi� detaily"
 msgid "Cancel Operation"
 msgstr "Zru�i� oper�ciu"
 
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "�peci�lne prie�inky"
+
 #: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "In�tal�cia Evolution"
@@ -9072,7 +9215,8 @@ msgstr ""
 
 #: shell/e-setup.c:130
 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."
+msgstr ""
+"Pros�m, stla�te \"OK\" pre in�tal�ciu s�borov, alebo \"Zru�i�\" pre koniec."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
@@ -9185,7 +9329,7 @@ msgstr "Naozaj chcete odstr�ni� prie�inok `%s'?"
 msgid "Rename folder '%s'"
 msgstr "Premenova� prie�inok '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9194,11 +9338,11 @@ msgstr ""
 "Zadan� prie�inok sa ned� vytvori�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Zadan� meno prie�inku nie je platn�."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Vytvori� nov� prie�inok"
 
@@ -9210,7 +9354,7 @@ msgstr ""
 "Typ vybran�ho prie�inku nie je platn�\n"
 "pre po�adovan� oper�ciu."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nov�..."
 
@@ -9363,11 +9507,13 @@ msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte prie�inok, kam m� skratka smerova�:"
 
 #: shell/e-shell-view-menu.c:689
-msgid "Work online"
+#, fuzzy
+msgid "Work Online"
 msgstr "Pracova� on-line"
 
 #: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-msgid "Work offline"
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Pracova� off-line"
 
 #: shell/e-shell-view.c:175
@@ -9375,7 +9521,7 @@ msgid "(No folder displayed)"
 msgstr "(Nezobrazen� �iadny prie�inok)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1439
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 msgid "My Evolution"
 msgstr "Moje Evolution"
 
@@ -9440,91 +9586,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Neodstra�ova�"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Premenova� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Premenova� t�to skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Mal� ikony"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Zobrazi� skratky ako mal� ikony"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Zobrazi� skratky ako ve�k� ikony"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nov� skupina..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Vytvori� nov� skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "Odst_r�ni� t�to skupinu..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Odstr�ni� t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "_Premenova� t�to skupinu..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Premenuje t�to skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Skry� panel skratiek"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Premenova� skratku"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Premenova� t�to skratku na:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Otvori�"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Otvori� prie�inok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otvori� v novom okne"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 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:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Premenova�"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Premenuje t�to skratku"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstr�ni� t�to skratku z panelu skratiek"
 
@@ -9588,13 +9738,12 @@ msgstr "Oper�cia nepodporovan�"
 msgid "The specified type is not supported in this storage"
 msgstr "Uveden� typ nie je podporovan� t�mto skladom"
 
-#: shell/e-task-widget.c:169
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:174
-#, c-format
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotov�ch)"
 
@@ -9664,7 +9813,7 @@ msgstr "T�to spr�vu u� nezobrazova�"
 msgid "Evolution has found the following data sources:"
 msgstr "Evolution na�la tieto zdroje d�t:"
 
-#: shell/main.c:92
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9693,7 +9842,7 @@ msgstr ""
 "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:113
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9701,28 +9850,28 @@ msgstr ""
 "V�aka\n"
 "T�m Evolution\n"
 
-#: shell/main.c:151
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Nie je mo�n� inicializova� shell Evolution."
 
-#: shell/main.c:211
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Zak�za� �vodn� okno"
 
-#: shell/main.c:212
+#: shell/main.c:216
 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:247
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je mo�n� inicializova� komponentov� syst�m Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Vystri_hn��"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kop�rova�"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Skop�ruje v�ber"
 
@@ -9734,7 +9883,11 @@ msgstr "Vytvori� nov� kontakt"
 msgid "Create new contact list"
 msgstr "Vytvori� nov� zoznam kontaktov"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Vystrihn��"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Vystrihne v�ber"
 
@@ -9750,7 +9903,11 @@ msgstr "Nov� kontakt"
 msgid "New list"
 msgstr "Nov� zoznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Vlo�i�"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Vlo�� obsah schr�nky"
 
@@ -9790,17 +9947,7 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "Skupina _kontaktov"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Kop�rova�"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Vlo�i�"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Tla�i�..."
@@ -9813,165 +9960,120 @@ msgstr "_H�ada� kontakty"
 msgid "_Select All"
 msgstr "Vybra� _v�etko"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_N�stroje"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dn�"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Zmeni� nastavenie"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Vytvori� nov� celodenn� udalos�"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Vytvori� nov� sch�dzku"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Vytvori� nov� kalend�r"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Vytvori� nov� sch�dzku"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "De�"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Prejs� na"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Prejs� dozadu"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Prejs� dopredu"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Prejs� na _d�tum"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Prejs� na d_ne�n� d�tum"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Prejs� na zadan� d�tum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Prejs� na aktu�lny �as"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Mesiac"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Nov� _udalos�"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:50
-msgid "Next"
-msgstr "Nasl"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Otvori� kalend�r"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Pred"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nov� sch�dzka"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Uk�ka kalend�ra pred tla�ou"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Tla�i� kalend�r"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Tla�i� tento kalend�r"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy Information"
 msgstr "Publikova� inform�cie o vo�nom �ase"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publikova� inform�cie o vo�nom �ase pre tento kalend�r"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Ulo�i� ako"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Ulo�i� kalend�r ako nie�o in�"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Nastavenie..."
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Zobrazi� jeden de�"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Zobrazi� jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Zobrazi� jeden t��de�"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Zobrazi� pracovn� t��de�"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:429
-msgid "Today"
-msgstr "Dnes"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "P_racovn� t��de�"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "T��de�"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Sch�dzka"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Nastavenie _po�ty..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_De�"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mesiac"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-msgid "_New"
-msgstr "_Nov�"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "_Otvori� kalend�r"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_T��de�"
 
@@ -10000,7 +10102,7 @@ msgstr "Hlavn� panel n�strojov"
 msgid "Preview the printed item"
 msgstr "N�h�ad polo�ky pred tla�ou"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "U_k�ka pred tla�ou"
 
@@ -10037,20 +10139,15 @@ msgstr "Nastav� str�nku pre aktu�lnu tla�iare�"
 msgid "_Action"
 msgstr "A_kcia"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_S�bor"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "_Pomocn�k"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Odstr�ni t�to polo�ku"
@@ -10070,7 +10167,7 @@ msgstr "Tla�i� _ob�lku..."
 
 #: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Ulo�i� _ako..."
 
@@ -10167,78 +10264,83 @@ msgid "Compose"
 msgstr "Nap�sa�"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Nap�sa� spr�vu"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Vytvor� alebo uprav� po�tov� ��ty a in� nastavenia"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Vytvor� alebo uprav� pravidl� pre filtrovanie novej po�ty"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Vytvor� alebo uprav� defin�cie virtu�lnych prie�inkov"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Vypr�zdni� _Odpadky"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Zabudn�� _hesl�"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zabudn�� ulo�en� hesl�, tak�e ich budete musie� znovu zada�"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "Spr�va _prihl�sen�..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Otvor� okno pre p�sanie spr�vy"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvalo odstr�ni� v�etky zmazan� spr�vy zo v�etk�ch prie�inkov"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Pr�jem / odoslanie"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Posla� neodoslan� po�tu a prija� nov� po�tu"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Zobrazi� okno s n�h�adom spr�vy"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihl�si� alebo odhl�si� prie�inky na vzdialen�ch serveroch"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtu�lneho prie�inku..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_Posla� spr�vu"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "Nastavenie _po�ty..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "_N�h�ad"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Posla� / Prija�"
 
@@ -10267,7 +10369,8 @@ msgid "Hide _Read Messages"
 msgstr "Skry� _pre��tan� spr�vy"
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skryje zmazan� spr�vy namiesto zobrazenia �krtnut�m"
 
 #: ui/evolution-mail-list.xml.h:10
@@ -10486,167 +10589,207 @@ msgstr "Pred� niekomu vybran� spr�vu"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Pred� vybran� spr�vu niekomu ako pr�lohu"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Nahr�va� _obr�zky"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Ozna�i� ako _d�le�it�"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Ozna�i� ako ned�_le�it�"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Ozna�� vybran� spr�vy ako u� pre��tan�"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Ozna�� vybran� spr�vy ako d�le�it�"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Ozna�� vybran� spr�vy ako nepre��tan�"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Ozna�� vybran� spr�vy ako ned�le�it�"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Ozna�� vybran� spr�vy na zmazanie"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Presun��"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Presun�� vybran� spr�vy do in�ho prie�inku"
 
 #: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Nasl"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Prejs� na nasleduj�cu d�le�it� spr�vu"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Spr�va"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Vybra� _vl�kno"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Spr�va bez mena"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Otvor� aktu�lnu spr�vu v novom okne"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Otvor� vybran� spr�vu v composeri pre nov� poslanie"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Uk�ka spr�vy pred tla�ou"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Predch�dzaj�ca"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Prejs� na predch�dzaj�cu d�le�it� spr�vu"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Tla�i� spr�vu"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Prejs� na predch�dzaj�cu nepre��tan� spr�vu"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Tla�i� spr�vu..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "N�h�ad..."
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Print message to the printer"
-msgstr "Tla�i� spr�vu na tla�iarni"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Tla�i� spr�vu"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odpoveda�"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Odpoveda� v�etk�m"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_N�js� spr�vu"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Ulo�i� spr�vu do textov�ho s�boru"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "H�ad� v texte zobrazenej spr�vy"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Zobrazi� zdrojov� _k�d spr�vy"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Zobrazi� �_pln� hlavi�ky"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Zobrazi� spr�vu norm�lne"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Zobrazi� spr�vu so v�etk�mi hlavi�kami"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Zobrazi� zdrojov� po�tov� form�t v spr�ve"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Obnovi� vybran� spr�vy"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VPrie�inok na _konferenciu..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "Vprie�inok na _odosielate�a..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "Vprie�inok na _adres�tov..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "Vprie�inok na _predmet..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Pou�i� filtre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kop�rova� do prie�inku"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Vytvori� _filter zo spr�vy"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Spr�vy _predan� �alej"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Zobrazenie _spr�vy"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Presun�� do prie�inku"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Norm�lne zobrazenie"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Otvori� spr�vu"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Znovu posla� spr�vu"
 
@@ -10667,7 +10810,7 @@ msgid "Customize toolbars"
 msgstr "Prisp�sobi� panely n�strojov"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 msgid "_Close"
@@ -10707,153 +10850,159 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Vlo�i� textov� s�bor...."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Vlo�i� s�bor ako text do spr�vy"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Vlo�i� textov� s�bor...."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otvorí s�bor"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "�ifrovanie PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "�ifrovanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Ulo�i�"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Ulo�i� ako"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Ulo�i� _koncept"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Ulo�i� v prie�inku..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Ulo�i� aktu�lny s�bor"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Ulo�� aktu�lny s�bor pod in�m menom"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Ulo�i� spr�vu do dan�ho prie�inku"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Posla�"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Posla� _nesk�r"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Posla� _nesk�r"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Posla� spr�vu vo form�te HTML"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Posla� spr�vu nesk�r"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Posla� t�to spr�vu hne�"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Zobrazi� / Skry� pr�lohy"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Zobrazi� _pr�lohy"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Zobrazi� pr�lohy"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Podp�sa� t�to spr�vu k���om PGP"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podp�sa� t�to spr�vu podpisov�m certifik�tor S/MIME"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prepne, �i m� by� zobrazen� pole BCC"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prepne, �i m� by� zobrazen� pole CC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prepne, �i m� by� zobrazen� pole pre v�ber odosielate�a"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepne, �i m� by� zobrazen� pole Reply-to"
 
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Attachment"
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
 msgstr "_Pr�loha"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Pole _BCC"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Pole _CC"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Ladi�"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Odstr�ni� v�etky"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vlo�i�"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Vlo�i� textov� s�bor...."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Otvori�..."
@@ -10866,6 +11015,10 @@ msgstr "Pole _Reply-To"
 msgid "_Security"
 msgstr "Za_bezpe�enie"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Pomocn�k"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Prida� prie�inok do zoznamu prihl�sen�ch prie�inkov"
@@ -10907,40 +11060,41 @@ msgid "Re_fresh Task"
 msgstr "O_bnovi� �lohu"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kop�ruje vybran� �lohu"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Vytvor� nov� �lohu"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Vystihne vybran� �lohu"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Odstr�ni� vybran� �lohy"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nov� �loha"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Vlo�� �lohu zo schr�nky"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Ulo�i� �lohu ako nie�o in�"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Nastavenie poh�adu �loh"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Nastavenie �loh..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Nastavenie �loh"
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Nastavenie _po�ty..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -11066,10 +11220,6 @@ msgstr "Pomocou _Po�ty "
 msgid "View the selected folder"
 msgstr "Zobrazi� vybran� prie�inok"
 
-#: ui/evolution.xml.h:38
-msgid "Work Offline"
-msgstr "Pracova� off-line"
-
 #: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
@@ -11110,6 +11260,10 @@ msgstr "_Posla� spr�vu"
 msgid "_Move..."
 msgstr "_Presun��..."
 
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nov�"
+
 #: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Nov� _prie�inok"
@@ -11181,10 +11335,6 @@ msgstr "S kateg�riou"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Predbe�n�"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Zanepr�zdnen�"
@@ -11267,19 +11417,18 @@ 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:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PUS�PSN"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Teraz"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Dnes"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
@@ -11378,11 +11527,11 @@ msgstr "Ulo�i� h�adanie"
 msgid "Advanced Search"
 msgstr "Pokro�il� h�adanie"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Zobrazi� v�etko"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Pokro�il�..."
 
@@ -11435,3 +11584,135 @@ msgstr "init_corba(): Nie je mo�n� inicializova� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je mo�n� inicializova� Bonobo"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Nastavenie poh�adu �loh"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Nastavenie �loh"
+
+#~ msgid "(none)"
+#~ msgstr "(ni�)"
+
+#~ msgid "File not found"
+#~ msgstr "S�bor nen�jden�"
+
+#~ msgid "Open calendar"
+#~ msgstr "Otvori� kalend�r"
+
+#~ msgid "Save calendar"
+#~ msgstr "Ulo�i� kalend�r"
+
+#~ msgid "Edit this task"
+#~ msgstr "Upravi� t�to �lohu"
+
+#~ msgid "Go to Today"
+#~ msgstr "Prejs� na dne�n� d�tum"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Odstr�ni� v�etky v�skyty"
+
+#~ msgid "Summary contains"
+#~ msgstr "S�hrn obsahuje"
+
+#~ msgid "Description contains"
+#~ msgstr "Popis obsahuje"
+
+#~ msgid "Comment contains"
+#~ msgstr "Koment�r obsahuje"
+
+#~ msgid "Has category"
+#~ msgstr "M� kateg�riu"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Prech�dzam prie�inok IMAP"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Preda� �alej na adresu"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: �iadny predmet]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Predan� spr�va (bez predmetu)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Spr�va poslan� �alej-----<br><b>Od:</b> %s<br><b>Komu:</b> "
+#~ "%s<br><b>Predmet:</b> %s<br>"
+
+#~ msgid "�F"
+#~ msgstr "�F"
+
+#~ msgid "�C"
+#~ msgstr "�C"
+
+#~ msgid "knots"
+#~ msgstr "uzlov"
+
+#~ msgid "kph"
+#~ msgstr "kph"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "m��"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometrov"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "Vy�isti� sledova�e"
+
+#~ msgid "Work offline"
+#~ msgstr "Pracova� off-line"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dn�"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Zmeni� nastavenie"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Vytvori� nov� kalend�r"
+
+#~ msgid "Day"
+#~ msgstr "De�"
+
+#~ msgid "Month"
+#~ msgstr "Mesiac"
+
+#~ msgid "New _Event"
+#~ msgstr "Nov� _udalos�"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Otvori� kalend�r"
+
+#~ msgid "Prev"
+#~ msgstr "Pred"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Ulo�i� kalend�r ako nie�o in�"
+
+#~ msgid "Settings..."
+#~ msgstr "Nastavenie..."
+
+#~ msgid "Week"
+#~ msgstr "T��de�"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Otvori� kalend�r"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Tla�i� spr�vu na tla�iarni"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Vlo�i� textov� s�bor...."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Nastavenie �loh..."
diff --git a/po/sl.po b/po/sl.po
index 20cb147994..2739adea32 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-05 14:17+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3546
+#: 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."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Uvozi datoteke eVizitk v Evolucijo. "
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3548
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3549
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3550
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +49,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3551
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +57,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +65,7 @@ msgstr ""
 "\n"
 "  Dru�insko:     "
 
-#: addressbook/backend/ebook/e-card.c:3553
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +73,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +81,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3578
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +89,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3580
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +97,7 @@ msgstr ""
 "\n"
 "  Po�tni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3581
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +105,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3582
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +113,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3583
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +121,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3584
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +129,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +137,7 @@ msgstr ""
 "\n"
 "  Po�tna �tevilka: "
 
-#: addressbook/backend/ebook/e-card.c:3586
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +145,7 @@ msgstr ""
 "\n"
 "  Dr�ava:      "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +153,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +161,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3614
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +169,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +185,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +193,7 @@ msgstr ""
 "\n"
 "Po�tni program: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +201,7 @@ msgstr ""
 "\n"
 "�asovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +209,7 @@ msgstr ""
 "\n"
 "Geografski polo�aj: "
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +217,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +225,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +233,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3694
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3695
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +265,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3699
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +273,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +299,7 @@ msgstr ""
 "\n"
 "Enoli�en niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -299,35 +307,23 @@ msgstr ""
 "\n"
 "Javni klju�: "
 
-#: addressbook/backend/ebook/e-card.c:3978
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Ve� eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:3986
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "eVizitka za %s"
 
-#: addressbook/backend/ebook/e-destination.c:344
-msgid "???"
-msgstr "???"
-
-#: 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."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Uvozi datoteke eVizitk v Evolucijo. "
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
@@ -341,14 +337,14 @@ msgid "EBook not loaded\n"
 msgstr "EKnjiga ni nalo�ena\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati stre�nika wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
@@ -357,264 +353,636 @@ msgstr "Nisem mogel pognati programa wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Kontrola Bonobo za vznik naslova."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Kontrola Bonobo za prikaz naslova."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Vzor�na kontrola Bonobo, ki prika�e adresar."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Kontrola, ki prika�e mini vizitko iz Evolucijinega adresarja."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolucijina komponenta za urejanje stikov."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Tovarna za orodje mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Tovarna za prikazovalnik adresarjeve adrese"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Tovarna za Adresarjev vznik naslova"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Tovarna za Evolucijino komponento adresarja."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Tovarna za vzor�no kontrolo adresarja"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Stre�nik LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Datoteka"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Neznan tip adresarja"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Brez (anonimni na�in)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Geslo"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Neznan na�in avtentifikacije"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Osnovno"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Ena"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Poddrevo"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Neznan tip dosega"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Povezan z domeno:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Bind DN Help text here"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Zapomni si geslo"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Gostitelj:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Host help text here."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Kornsko ime domene:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Root DN help text here."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Vrata:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Port help text here."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Doseg iskanja:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Avtentifikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Napredne mo�nosti LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Pot:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Path help text here"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "�e pot ne obstaja jo ustvari."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Uredi adresar"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Dodaj adresar"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Ime:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Name help text here"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Opis:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME Description help text here"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Dodaj"
+msgid "Addressbook Sources"
+msgstr "Viri adresarja"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Zbri�i"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Ime"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Drugo stiki"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Vpi�ite geslo za %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kliknite tu za odprtje adresarja"
+
+#: addressbook/gui/component/addressbook.c:380
+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 ""
+"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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Ta razli�ica Evolucije nima vgrajene podpore za LDAP.\n"
+"�e �elite v Evoluciji uporabljati LDAP, morate po tem,\n"
+"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
+"Evolucijo prevesti iz izvorne kode CVS.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
+"pot obstaja in ali imate dovoljenje za dostop."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Katerokoli polje vsebuje"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Ime vsebuje"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-naslov vsebuje"
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategorija vsebuje"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ki naj ga prika�e brskalnik map"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-naslov 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Izberi dejanje"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Ustvari nov stik \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, 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
+msgid "Querying Addressbook..."
+msgstr "Poizvedujem v adresarju..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Uredi podatke stika"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Dodaj k stikom"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Zlij E-po�tne naslove"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Izklju�i poizvedbe"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Vklju�i poizvedbe (nevarno!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+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:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Odstrani"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Odstrani vse"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "Po�lji po�to v obliki HTML?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Spremenjen stik:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Prejemniki sporo�ila"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Izberi imena"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Izberi ime iz _mape:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "I_skanje"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "V sl_u�bi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Slu�beni _faks"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Stiki..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Zavedi kot:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Splo�no"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizacija:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipi telefonov"
 
-#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "�eli dobivati _HTML e-po�to"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Naslov spletne strani:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:100
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Naslov..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Ime pomo�nika:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Slu�beni"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Podjetje:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Stiki..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1237 mail/mail-config.glade.h:101
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Zbri�i"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Slu�beni _naziv:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Partner(ka):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_To je po�tni naslov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Zbri�i stik?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada slede�im kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Pomo�nik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Slu�ba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Slu�ba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Slu�beni faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Doma�i faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Zbri�i stik?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
@@ -624,7 +992,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -744,381 +1112,45 @@ msgstr "P_ripona:"
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Vpi�ite geslo za %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Ime gostitelja:"
 
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "december"
 
-#: addressbook/gui/component/addressbook.c:380
-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"
+#: 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 ""
-"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:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"Ta razli�ica Evolucije nima vgrajene podpore za LDAP.\n"
-"�e �elite v Evoluciji uporabljati LDAP, morate po tem,\n"
-"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
-"Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
-"pot obstaja in ali imate dovoljenje za dostop."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr "_Odstrani"
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
-msgid "Any field contains"
-msgstr "Katerokoli polje vsebuje"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "Ime vsebuje"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "E-naslov vsebuje"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategorija vsebuje"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ki naj ga prika�e brskalnik map"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Stre�nik LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Datoteka"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Neznan tip adresarja"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Brez (anonimni na�in)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
-msgid "Password"
-msgstr "Geslo"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Neznan na�in avtentifikacije"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Poddrevo"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Neznan tip dosega"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Povezan z domeno:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:72
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
-msgid "Host:"
-msgstr "Gostitelj:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Host help text here."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Kornsko ime domene:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN help text here."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Vrata:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Doseg iskanja:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Avtentifikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Napredne mo�nosti LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
-msgid "Path:"
-msgstr "Pot:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path help text here"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "�e pot ne obstaja jo ustvari."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53
-msgid "Name:"
-msgstr "Ime:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Opis:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
-msgid "Delete"
-msgstr "Zbri�i"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Uredi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#.
-#. * 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
-msgid "(none)"
-msgstr "(brez)"
-
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Izberi dejanje"
-
-#: addressbook/gui/component/e-address-popup.c:585
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Ustvari nov stik \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:597
-#, 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
-msgid "Querying Addressbook..."
-msgstr "Poizvedujem v adresarju..."
-
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "Uredi podatke stika"
-
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "Dodaj k stikom"
-
-#: addressbook/gui/component/e-address-popup.c:989
-msgid "Merge E-Mail Address"
-msgstr "Zlij E-po�tne naslove"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Izklju�i poizvedbe"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Vklju�i poizvedbe (nevarno!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Kontrola Bonobo za vznik naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Kontrola Bonobo za prikaz naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Vzor�na kontrola Bonobo, ki prika�e adresar."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrola, ki prika�e mini vizitko iz Evolucijinega adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolucijina komponenta za urejanje stikov."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Tovarna za orodje mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Tovarna za prikazovalnik adresarjeve adrese"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Tovarna za Adresarjev vznik naslova"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Tovarna za Evolucijino komponento adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Tovarna za vzor�no kontrolo adresarja"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
-msgid "Remove"
-msgstr "Odstrani"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Odstrani vse"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "Po�lji po�to v obliki HTML?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Prejemniki sporo�ila"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Izberi ime iz _mape:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategorija:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "I_skanje"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Urejevalnik stikov"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vseeno dodaj"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Zaznan podvojen stik"
 
@@ -1139,18 +1171,14 @@ msgstr ""
 "Ga �elite vseeno dodati?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "Vseeno spremeni"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Spremenjen stik:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Konfliktni stik:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1158,8 +1186,13 @@ msgstr ""
 "Spremenjeno ime ali e-po�tni naslov tega stika �e\n"
 "obstaja v tej mapi. Ga �elite vseeno dodati?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Vseeno spremeni"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Iskanje"
 
@@ -1290,9 +1323,9 @@ msgstr "Stiku po�lji sporo�ilo"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
@@ -1301,138 +1334,213 @@ msgstr "Natisni"
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+msgid "Error modifying card"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Viri"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Delaj brez mre�e"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Nimate dovoljenja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Datoteke ni mogo�e najti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operacija ni podprta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "preklicano"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "V/I napaka"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Napaka ob nalaganju %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-po�ta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Pomo�ni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Slu�bebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Doma� telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Slu�beni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Doma�i naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Slu�beni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Doma� telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Opravljeno."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Odstranjujem vizitke..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Napaka ob spreminjanju vizitke"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
@@ -1480,7 +1588,8 @@ msgid "Dimensions:"
 msgstr "Mere:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Pisava..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1619,37 +1728,62 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "�irina:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Pisava..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s stre�nikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Opomin na zmenek ob "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Kontrola Bonobo, ki prika�e koledar."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Podalj�ek spanja"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolucijina komponenta za povzetke."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "V redu"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Komponenta Evolucije za urejanje koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Tovarna komponent za povzetke koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Tovarna komponent Evolucije za urejanje koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Tvoarna za orodje koledarja iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Vzor�na tovarna za kontrolo koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Tovarna komponent Evolucije za urejanje koledarja."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1659,87 +1793,88 @@ 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:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Obvestilo o va�em zmenku, ki se za�ne ob %s in kon�a ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Obvestilo o va�em zmenku, ki se za�ne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Obvestilo o va�em zmenku, ki se kon�a ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Obvestilo o va�em zmenku"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, 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:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, 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:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, 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:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Obvestilo o va�em opravilu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "Obvestilo o va�em dnevni�kem vpisu, ki se za�ne ob %s in kon�a ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "Obvestilo o va�em dnevni�kem vpisu, ki se za�ne ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "Obvestilo o va�em dnevni�kem vpisu, ki se kon�a ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-msgid "Notification about your journal entry"
-msgstr "Obvestilo o va�em dnevni�kem vpisu"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 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:301
-msgid "No summary available."
-msgstr "Povzetek ni na voljo."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.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:3 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Zapri"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Zapri"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Podalj�ek spanja"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "�as podalj�ka spanja (minut)"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Uredi zmenek"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Povzetek ni na voljo."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Opomin na zmenek ob "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Podalj�ek spanja"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "V redu"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1760,128 +1895,151 @@ msgstr "Nisem mogel inicializirati gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/calendar-commands.c:277
-msgid "File not found"
-msgstr "Datoteke ni mogo�e najti"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:301
-msgid "Open calendar"
-msgstr "Odpri koledar"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:343
-msgid "Save calendar"
-msgstr "Shrani koledar"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:545
+#: calendar/gui/calendar-commands.c:586
 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:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:334
-#: calendar/gui/dialogs/alarm-page.c:370
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "visoka"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "obi�ajna"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "nizka"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "ni pri�eto"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "kon�ano"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "preklicano"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:873 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1892,23 +2050,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
-#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
-#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
-#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1918,158 +2080,253 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vklju�no 0 in 100"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteta mora biti 'Visoka', 'Obi�ajna', 'Nizka' ali 'Nedefinirana'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Dolo�ena"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Ne"
 
+#: calendar/gui/calendar-view-factory.c:149 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
+msgid "Work Week View"
+msgstr "Pogled delavnega tedna"
+
+#: calendar/gui/calendar-view-factory.c:155 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
+msgid "Month View"
+msgstr "Mese�ni pogled"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prika�e brskalnik map"
 
-#: calendar/gui/dialogs/alarm-page.c:269
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Zvo�ni alarmi"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Prejemniki sporo�ila"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Poka�i mo�nosti"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+#, fuzzy
+msgid "Unknown Alarm Options"
+msgstr "Neznane padavine"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#, fuzzy
+msgid "Alarm Repeat"
+msgstr "Lastnosti alarma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Prikaz _sporo�ila"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Predvajaj zvok"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Po�eni program"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dni"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Posodobi vsakih"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "ur"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minut"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:271
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:274
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:276
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:279
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:281
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:316
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: calendar/gui/dialogs/alarm-page.c:320
-msgid "Show a dialog"
-msgstr "Ka�i dialog"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Ka�i sporo�ilo"
 
-#: calendar/gui/dialogs/alarm-page.c:324
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Po�lji e-po�to"
 
-#: calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Po�eni program"
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " pred pri�etkom zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:349
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " po pri�etku zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:359
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " pred koncem zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:362
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " po koncu zmenka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Osnove"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Datum/ura:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Display a message"
-msgstr "Ka�i sporo�ilo"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Options..."
-msgstr "Mo�nosti..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Opozorila"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Mo�nosti..."
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2092,7 +2349,7 @@ msgstr "konec zmenka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minut"
 
@@ -2132,8 +2389,8 @@ msgstr "60 minut"
 msgid "Beep when alarm windows appear."
 msgstr "Pozvoni, ko se poka�ejo okna alarmov."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
-#: ui/evolution-calendar.xml.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -2166,7 +2423,7 @@ msgid "Defaults"
 msgstr "Privzeto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Prikaz"
 
@@ -2183,7 +2440,7 @@ msgid "Fri"
 msgstr "pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "petek"
 
@@ -2192,7 +2449,7 @@ msgid "Mon"
 msgstr "pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -2213,7 +2470,7 @@ msgid "Sat"
 msgstr "sob"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "sobota"
 
@@ -2234,7 +2491,7 @@ msgid "Sun"
 msgstr "ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -2251,7 +2508,7 @@ msgid "Thu"
 msgstr "�et"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "�etrtek"
 
@@ -2276,7 +2533,7 @@ msgid "Tue"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "torek"
 
@@ -2285,7 +2542,7 @@ msgid "Wed"
 msgstr "sre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -2297,6 +2554,142 @@ msgstr "Delavni teden"
 msgid "minutes before they occur."
 msgstr "minut preden se zgodijo."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ste prepri�ani, da �elite zbrisati ta ra�un?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ste prepri�ani, da �elite zbrisati %d opravil?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ste prepri�ani, da �elite zbrisati dnevni�ki vpis `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
+msgid "This task has been deleted."
+msgstr "To je zahtevek po sre�anju."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+#, fuzzy
+msgid "This task has been changed."
+msgstr "To je preklic dogodka."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr " (Kon�ano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr "kon�ano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr "Rok"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Zmenek - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Vpis v dnevniku - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Ni povzetka"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Prepi�i datoteko?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Datoteka z enakim imenom �e obstaja.\n"
+"Naj jo prepi�em?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Shrani kot..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2339,20 +2732,44 @@ msgstr "Ste prepri�ani, da �elite zbrisati %d opravil?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ste prepri�ani, da �elite zbrisati %d dnevni�kih vpisov?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Izberi datoteko"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sekcije:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"�asovni pas: "
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Zmenek"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "Sre�anje"
 
@@ -2362,7 +2779,7 @@ msgstr "_Celodnevni dogodek"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Uvrstitev"
 
@@ -2391,11 +2808,6 @@ msgstr "_Povzetek:"
 msgid "_Confidential"
 msgstr "_Zaupno"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "_�as konca:"
@@ -2404,38 +2816,271 @@ msgstr "_�as konca:"
 msgid "_Start time:"
 msgstr "_�as pri�etka:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Skupina %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Viri:"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Stol"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Potrebni udele�enci"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Mo�ni sodelujo�i"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Ne-sodelujo�i"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Izberi dejanje"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Sprejmi "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Zavrni "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Poskusno"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Zbrisano"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "v teku"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon v avtu"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Potrebni udele�enci"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Mo�ni sodelujo�i"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Ne-sodelujo�i"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Poslano"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Delegirano komu:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Udele�en"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Datum zaklju�ka"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Delegirano od:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Delegirano komu:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Upravljalec"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "december"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Vloga"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stanje"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Vrsta"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Povabi ostale..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dan"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "pojavitve"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Ponovitev po meri"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Vsak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Izjeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Spremeni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Ni ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Predogled"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Pravilo ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Enostavna ponovitev"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Spremeni"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "za"
@@ -2460,39 +3105,22 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/recurrence-page.c:412 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:560
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
-
-#: calendar/gui/dialogs/recurrence-page.c:932
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dan"
-
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
-msgstr "na"
-
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1266
-msgid "occurrences"
-msgstr "pojavitve"
-
 #: 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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Kon�ano dne:"
@@ -2509,12 +3137,8 @@ msgstr "Delegirano komu:"
 msgid "No one"
 msgstr "Nikomur"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2547,329 +3171,317 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "kategorije"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Datum zaklju�ka"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Datum konca"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Datum pri�etka"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Do datuma"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "Zemljepisna lega"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Procentov opravljeno"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "Priority"
-msgstr "Prioriteta"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Prosojnost"
-
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarmi"
-
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Kliknite tu za dodajo opravila"
-
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
-msgid "Edit this task"
-msgstr "Uredi to opravilo"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Izre�i"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopiraj"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
-#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Prilepi"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:962
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Ozna�i kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:963
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Zbri�i to nalogo"
 
-#: calendar/gui/e-calendar-table.c:972
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Ozna�i opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Zbri�i izbrana opravila"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
-#: calendar/gui/print.c:785
-msgid "am"
-msgstr "dop"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Kliknite tu za dodajo opravila"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "pop"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% kon�a_no:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmi"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "kategorije"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Kon�ano"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Datum zaklju�ka"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Do datuma"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Datum konca"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Zemljepisna lega"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Datum pri�etka"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Povzetek"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Seznam nalog"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Prosojnost"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:1327
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
-#: calendar/gui/e-week-view-main-item.c:334
-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:1354
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "dop"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pop"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nov zmenek"
 
-#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nov celodnevni dogodek"
 
-#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
-msgid "Go to Today"
-msgstr "Pojdi na danes"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
-#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Odpri"
-
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Zbri�i ta zmenek"
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev prestavljivo"
 
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Zbri�i to pojavitev"
 
-#: calendar/gui/e-day-view.c:3332
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Zbri�i vse pojavitve"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
-
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr " (Kon�ano "
-
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "kon�ano "
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr " (Rok "
-
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Rok"
-
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "To je dogodek, ki je lahko dodan va�emu koledarju."
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "To je zahtevek po sre�anju."
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "To so en ali ve� dodatkov k trenutnemu sre�anju."
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "To je zahtevek za sve�e podatke o dogodku."
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "To je odgovor na zahtevek po sre�anju."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "To je preklic dogodka."
 
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "To sporo�ilo ni razumljivo."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "To je opravilo, ki je lahko dodano v va� koledar."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "To je zahtevek po opravilu."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "To je zahtevek za sve�e podatke o opravilu."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "To je odgovor na zahtevek po opravilu."
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "To je preklic opravila."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "To je podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "To je zahtevek za podatk o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "To je odgovor na podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:834
 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:737
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "To sporo�ilo vsebuje le nepodprte zahtevke"
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Podatki vsebovani v tej prilogi niso veljavni"
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nisem mogel posodobiti va�ege datoteeke koledarja!\n"
 
-#: calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nisem mogel odstraniti predmeta iz va�e datoteke koledarja!\n"
 
@@ -2910,98 +3522,48 @@ msgstr "kon�ni-datum"
 msgid "date-start"
 msgstr "za�etni-datum"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Vse"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel nalo�iti poslov v `%s'"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:415
 #, 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:3139 calendar/gui/e-week-view.c:3167
-msgid "New Appointment..."
-msgstr "Nov zmenek..."
-
-#: calendar/gui/e-week-view.c:3180
-msgid "Delete All Occurrences"
-msgstr "Zbri�i vse pojavitve"
-
 #. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "Povzetek vsebuje"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "Komentar vsebuje"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "Ima kategorijo"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nov zmenek..."
 
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1065
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za nalo�itev `%s' ni podprt"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Kontrola Bonobo, ki prika�e koledar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Komponenta Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Tovarna komponent za povzetke koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Tovarna komponent Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Tvoarna za orodje koledarja iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Vzor�na tovarna za kontrolo koledarja"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -3023,246 +3585,255 @@ msgid "Go To Date"
 msgstr "Pojdi na datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Pojdi na danes"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "januar"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "julij"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "junij"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marec"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Pojdi na danes"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "�e"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1781 my-evolution/e-summary.c:452
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape poslov, ki naj se ka�e"
 
@@ -3308,99 +3879,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPTS�PS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now ne pri�akuje argumentov"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time pri�akuje 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time pri�akuje, da je 1. argument niz"
-
-#: calendar/pcs/query.c:255
-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:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day pri�akuje 2 argumenta"
-
-#: calendar/pcs/query.c:286
-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:293
-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:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin pri�akuje 1 argument"
-
-#: calendar/pcs/query.c:323
-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:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end pri�akuje 1 argument"
-
-#: calendar/pcs/query.c:353
-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:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype ne pri�akuje argumentov"
-
-#: calendar/pcs/query.c:485
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? pri�akuje 2 argumenta"
-
-#: calendar/pcs/query.c:490
-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:497
-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:627
-msgid "contains? expects 2 arguments"
-msgstr "contains? pri�akuje 2 argumenta"
-
-#: calendar/pcs/query.c:632
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? pri�akuje, da je 1. argument niz"
-
-#: calendar/pcs/query.c:639
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? pri�akuje, da je 2. argument niz"
-
-#: calendar/pcs/query.c:656
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-"contains? pri�akuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
-"\" (povzetek), \"description\"(opis)"
-
-#: calendar/pcs/query.c:694
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? pri�akuje vsaj 1 argument"
-
-#: calendar/pcs/query.c:700
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? pri�akuje, da so vsi argumenti nizi"
-
-#: calendar/pcs/query.c:948
-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)"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
@@ -3421,60 +3899,75 @@ 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
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 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:526 camel/camel-filter-driver.c:535
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti �akalne mape"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati �akalne mape"
 
-#: camel/camel-filter-driver.c:658
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporo�ilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporo�ilu %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporo�ila"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "Kon�ano"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporo�ilo %d od %d"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporo�ilu %d od %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob raz�lenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
@@ -3515,6 +4008,26 @@ msgstr "Opravljam poizvedbo na neznani glavi: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, pri�akovan niz"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nisem mogel ustvariti cevi: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne morem ustvariti klju�avnice na mapi: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisem se mogel razvejiti: %s"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3538,108 +4051,108 @@ msgstr "Nisem uspel zakleniti s pomo�jo fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomo�jo flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti po�tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti po�tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, 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:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Napaka ob branju po�tne datoteke: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Napaka ob pisanju v za�asno po�tno datoteko: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, 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:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Napaka ob branju po�tne datoteke: %s"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju za�asne po�tne datoteke: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Prosim vpi�ite svoje %s geslo za %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Prosim vpi�ite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Ni besedila za podpis."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Ni besedila za �isti podpis."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Ni besedila za preverbo."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Nisem mogel ustvariti za�asne datoteke: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Ni besedila za �ifriranje."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Prejemniki niso navedeni"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Ni �ifriranega besedila za de�ifriranje."
 
@@ -3673,7 +4186,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -3682,13 +4195,13 @@ msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Povezava s stre�nikom je bila nepri�akovano prekinjena"
 
@@ -3766,8 +4279,8 @@ msgstr "Stre�nikov izziv ni veljaven\n"
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Stre�nikov izziv je vseboval neveljaven �len \"Quality of Protection"
-"\" (kvaliteta za��ite)\n"
+"Stre�nikov izziv je vseboval neveljaven �len \"Quality of Protection\" "
+"(kvaliteta za��ite)\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -3800,7 +4313,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Stre�nik je sporo�il slab odgovor avtentifikaciji."
 
@@ -3869,7 +4382,7 @@ msgstr "Za branje po�te kot poizvedbe po drugem sklopu map"
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3915,33 +4428,17 @@ msgstr "Nisem uspel de�ifrirati sporo�ila"
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:971 mail/mail-ops.c:978
-#: mail/mail-ops.c:996 mail/mail-ops.c:997
-msgid "Trash"
-msgstr "Smeti"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-po�ta: %s\n"
-"Obi�ajno ime: %s\n"
-"Organizacijska enota: %s\n"
-"Organizacija: %s\n"
-"Krajevnost: %s\n"
-"Regija/Zvezna dr�ava: %s\n"
-"Dr�ava: %s"
+"Proizvedel: %s\n"
+"Zadeva: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3956,26 +4453,36 @@ msgstr ""
 "\n"
 "Ga �elite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Proizvedel: %s\n"
-"Zadeva: %s"
+"E-po�ta: %s\n"
+"Obi�ajno ime: %s\n"
+"Organizacijska enota: %s\n"
+"Organizacija: %s\n"
+"Krajevnost: %s\n"
+"Regija/Zvezna dr�ava: %s\n"
+"Dr�ava: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti raz�leniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni tak�nega sporo�ila %s v %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni tak�nega sporo�ila: %s"
@@ -3984,35 +4491,26 @@ msgstr "Ni tak�nega sporo�ila: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Ne morete kopirati sporo�il iz te mape smeti."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nisem mogel odpreti predpomnilni�kega imenika: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepri�akovan odgovor stre�nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Odgovor stre�nika se je prehitro kon�al."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "odgovor IMAP stre�nika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepri�akovan OK odgovor stre�nika IMAP: %s"
@@ -4031,20 +4529,37 @@ msgstr "Nisem mogel nalo�iti povzetka za %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uni�ena in na novo ustvarjena na stre�niku."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "Pregledujem mapo IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Shranjujem spremembe sporo�ila..."
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1763
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "To sporo�ilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1796
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Shranjujem sporo�ila"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporo�ila v odgovoru FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Nisem mogel odpreti predpomnilni�kega imenika: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Preverjam za novo po�to"
 
@@ -4052,7 +4567,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:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mape"
 
@@ -4084,28 +4599,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:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za na�in avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4116,11 +4631,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni tak�ne mape %s"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Po�tni imeniki tipa MH"
@@ -4154,6 +4673,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "Za shranjevanje krajevne po�te v obi�ajnih Unix spool imenikih"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
@@ -4193,7 +4713,8 @@ msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporo�ila k povzetku: razlog neznan"
 
@@ -4209,6 +4730,7 @@ msgstr "Ne morem dodati sporo�ila v mapo tipa maildir: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4220,6 +4742,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Ni tak�nega sporo�ila"
 
@@ -4228,7 +4751,7 @@ msgstr "Ni tak�nega sporo�ila"
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporo�ila"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4238,14 +4761,14 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4255,23 +4778,23 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
@@ -4283,11 +4806,13 @@ 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:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti po�tnega predala: %s: %s\n"
@@ -4300,6 +4825,9 @@ msgstr "Ne morem pripeti sporo�ila k datoteki tipa mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4309,10 +4837,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 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:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporo�ila ni uspela: Naj pokvarim po�tni predal?"
 
@@ -4358,36 +4888,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Delam povzetek mape"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nisem mogel odpreti mape: %s: povzetek delam od %ld dalje: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem narediti povzetka mape %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1445
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti za�asnega po�tnega predala: %s"
@@ -4396,21 +4935,28 @@ msgstr "Nisem mogel odpreti za�asnega po�tnega predala: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 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:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, 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:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
@@ -4425,7 +4971,9 @@ msgstr "Nisem mogel zapreti za�asne mape: %s"
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -4445,6 +4993,62 @@ 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:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Ne morem pripeti sporo�ila k datoteki tipa mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' ni obi�ajna datoteka."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Mapa `%s' ne obstaja."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Krajevno shrambe nimajo vhodnega predala"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Krajevna datoteka s po�to %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Krajevnih map ni mogo�e gnezditi."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Krajevnih map ni mogo�e gnezditi."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Nisem mogel odpreti za�asne po�tne datoteke %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Nisem mogel prebrati mape `%s': %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -4467,17 +5071,17 @@ msgstr "Stre�nik je zavrnil uporabni�ko ime/geslo"
 msgid "Message %s not found."
 msgstr "Sporo�ilo %s ni bilo najdeno."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Nisem mogel dobiti seznama skupin s stre�nika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:157
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
@@ -4490,25 +5094,25 @@ msgstr "USENET novi�ke"
 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:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novi�ke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 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:323
-#: camel/providers/nntp/camel-nntp-store.c:485
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
@@ -4559,7 +5163,7 @@ msgstr "Pusti sporo�ila na stre�niku"
 msgid "Delete after %s day(s)"
 msgstr "Zbri�i po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4654,7 +5258,7 @@ msgid "No such folder `%s'."
 msgstr "Ni tak�ne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -4708,7 +5312,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava po�te preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:74
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4718,122 +5322,122 @@ msgstr ""
 "Za dostavo po�te preko povezave z oddaljenim po�tnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Sintakti�na napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakti�na napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomo�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Spor�ilo pomo�i"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 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:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 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:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekora�ena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 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:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je pre�ibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno �ifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Za�asna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, 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:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4844,118 +5448,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Stre�nik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava po�te s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 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:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 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:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Po�iljam sporo�ilo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporo�ila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Sre�anje"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, 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:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Avtentifikacija"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekora�il �asovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Stre�nik je sporo�il slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekora�il �asovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, 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:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
@@ -4985,7 +5603,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "priloga"
 
@@ -5014,10 +5632,69 @@ msgid "MIME type:"
 msgstr "Tip MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer.c:667
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Kliknite tu za adresar"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Zadeva:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "Za:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "Vnesite prejemnike sporo�ila"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+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:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Vnesite naslove, ki bodo prejeli karbonske kopije sporo�ila, a  se ne bodo "
+"pojavili v seznamu prejemnikov sporo�ila."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Prilo�i datoteko"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5026,7 +5703,7 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5035,21 +5712,30 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Opozorilo"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5057,16 +5743,25 @@ msgstr ""
 "Ni mogo�e odpreti mape osnutkov za ta ra�un.\n"
 "�elite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1015
-#, c-format
-msgid "Error opening file: %s"
-msgstr "Napaka ob odpiranju datoteke: %s"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporo�ila"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nisem mogel ustvariti izhodne datoteke: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5075,7 +5770,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1038
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5084,20 +5779,16 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporo�ila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1103
+#: composer/e-msg-composer.c:1173
+#, fuzzy
 msgid ""
-"Evolution has detected an editor buffer from a previous session.\n"
-"Would you like to recover this buffer?"
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 "Evolucija je zaznala medpomnilnik urejevalnika iz prej�nje seje.\n"
 "�elite znova uporabiti ta medpomnilnik?"
 
-#: composer/e-msg-composer.c:1228 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolucija"
-
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5107,75 +5798,27 @@ msgstr ""
 "\n"
 "�elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolucija"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1408
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1765 composer/e-msg-composer.c:2138
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Sestavi novo sporo�ilo"
 
-#: composer/e-msg-composer.c:2232
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/e-msg-composer-hdrs.c:325
-msgid "Click here for the address book"
-msgstr "Kliknite tu za adresar"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Zadeva:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "Za:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
-msgstr "Vnesite prejemnike sporo�ila"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-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:395
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:396
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Vnesite naslove, ki bodo prejeli karbonske kopije sporo�ila, a  se ne bodo "
-"pojavili v seznamu prejemnikov sporo�ila."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5201,40 +5844,56 @@ msgid "calendar information"
 msgstr "podatki o kodledarju"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5242,77 +5901,65 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "leto"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "let"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mesec"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "teden"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "tedenov"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dni"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "ura"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "ur"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minut"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " sekund"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Opa. Pozabili ste izbrati datum."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Opa. Izbrali ste neveljaven datum."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5322,7 +5969,7 @@ msgstr ""
 "�asom ob katerem se bo pognal filter\n"
 "ali vmapa odprta."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5330,7 +5977,7 @@ msgstr ""
 "Datum tega sporo�ila bo primerjan s �asom,\n"
 "ki ga navedete tu."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5341,28 +5988,37 @@ msgstr ""
 ".na primer \"teden dni nazaj\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "trenutni �as"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "�as, ki ga navedete"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "�as, relatievn trenutnemu"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Primerjaj z"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "sedaj"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "nazaj"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "nazaj"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
@@ -5387,8 +6043,8 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se po�ta dostavi."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
@@ -5400,46 +6056,6 @@ msgstr "Vnesite URI mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Uredi filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Uredi vMape"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Odhodna"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtualne mape"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "le izbrane mape"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Viri vMap"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "z vsemi aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "z vsemi krajevnimi mapami"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5461,36 +6077,88 @@ msgstr "Ime pravila: "
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "�e"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Izvr�i dejanja"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "�e je zado��eno vsem pogojem"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "�e je zado��eno kateremukoli pogoju"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "odhodna"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Dodaj"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Uredi"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Uredi filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Uredi vMape"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Dohodna"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Odhodna"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtualne mape"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "le izbrane mape"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Viri vMap"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "z vsemi aktivnimi oddaljenimi mapami"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "z vsemi krajevnimi mapami"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Pripi�i barvo"
 
 #: filter/libfilter-i18n.h:4
@@ -5566,128 +6234,120 @@ msgid "Expression"
 msgstr "Izraz"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Posreduj na naslove"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "je ve�je"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "je manj�e"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Jedro sporo�ila"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Glava sporo�ila"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Sporo�ilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Sporo�ilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "na ali po"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "To�ke"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1049
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Po�iljatelj"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Izvorni ra�un"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Dolo�ena glava"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "se za�ne z"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Stanje"
-
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -5707,29 +6367,23 @@ msgstr "Uredi pravilo"
 msgid "Score Rules"
 msgstr "To�ke pravil"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
-#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Uvozi"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Po�ta"
 
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Vzdevki programa Elm"
-
-#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
-#: importers/netscape-importer.c:796 importers/pine-importer.c:660
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Ne spra�uj me ve�"
-
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5737,15 +6391,15 @@ msgstr ""
 "Evolucija je na�la po�tne datoteke programa Elm.\n"
 "Jih �elite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Po�tni program Elm"
 
-#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: importers/evolution-gnomecard-importer.c:261
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5753,19 +6407,11 @@ msgstr ""
 "Evolucija je na�la datoteke GnomeCard-a.\n"
 "Jih �elite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:779 importers/pine-importer.c:648
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1693
-msgid "Filters"
-msgstr "Filtri"
-
-#: importers/netscape-importer.c:789
-msgid "Addressbooks"
-msgstr "Adresarji"
-
-#: importers/netscape-importer.c:836
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5773,7 +6419,7 @@ msgstr ""
 "Evolucija je na�la po�tne datoteke programa Netscape.\n"
 "Jih �elite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5781,187 +6427,207 @@ msgstr ""
 "Evolucija je na�la po�tne datoteke programa Pine.\n"
 "Jih �elite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Po�tni program Pine"
 
-#: mail/component-factory.c:666
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolucijina komponenta za obravnavo po�te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolucijin setavljalnik po�te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolucijina komponenta za povzetke."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolucijina komponenta za po�tne mape."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolucijina komponenta za tovarne po�tnih map."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Tovarna za Evolucijinega skladatelja."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Tovarna za Evolucijino komponento po�te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Tovarna za komponento povzetka po�te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Vmesnik za nastavitev po�te"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Lastnosti..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Spremeni lastnosti datoteke"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za po�to."
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:211 mail/mail-display.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Lastnosti za \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Lastnosti"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti za�asnega imenika: %s"
 
-#: mail/folder-browser.c:830
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
-#: mail/folder-browser.c:1173
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1176
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _po�iljatelja"
 
-#: mail/folder-browser.c:1179
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1182
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na po�tni se_znam"
 
-#: mail/folder-browser.c:1188
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1191
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter glede na po�ilja_telja"
 
-#: mail/folder-browser.c:1194
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1197
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_o�tni seznam"
 
-#: mail/folder-browser.c:1206
-msgid "_Open"
-msgstr "_Odpri"
-
-#: mail/folder-browser.c:1208
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Znova po�lji"
 
-#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1212 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Odgovori po�iljatelju"
 
-#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1223
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1226
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Ozna�i kot _prebrano"
 
-#: mail/folder-browser.c:1228
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Ozna�i kot _neprebrano"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Ozna�i kot po_membno"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Ozna�i kot po_membno"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1235
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "O_dbri�i"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Po�iljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1249
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Iz sporo�ila ustvari _pravilo"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Po�tni seznam"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na Po�tni seznam"
 
-#: mail/folder-browser.c:1395
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Po�tni seznam (%s)"
 
-#: mail/folder-browser.c:1396
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na Po�tni seznam (%s)"
 
-#: mail/folder-browser-ui.c:252
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Lastnosti za \"%s\""
-
-#: mail/folder-browser-ui.c:254
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolucijina komponenta za obravnavo po�te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolucijin setavljalnik po�te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolucijina komponenta za po�tne mape."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolucijina komponenta za tovarne po�tnih map."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Tovarna za Evolucijinega skladatelja."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Tovarna za Evolucijino komponento po�te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Tovarna za komponento povzetka po�te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Vmesnik za nastavitev po�te"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
@@ -6012,20 +6678,26 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Urejevalnik Evolucijinih ra�unov"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih ra�unov"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6035,28 +6707,38 @@ msgstr ""
 "\n"
 "�elite shraniti spremembe?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Izklju�i"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Vklju�i"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepri�ani, da �elite zbrisati ta ra�un?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Odbri�i"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Naj bo to moj privzet ra�un"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:697
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Upravljalnik Evolucijinih ra�unov"
 
@@ -6132,8 +6814,8 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "To sporo�ilo vsebuje le prejemnike bcc.\n"
-"Mo�no je, da po�tni stre�nik razkrije prejemnike z dodatkom glave Apparenlty-"
-"To (O�itno-za).\n"
+"Mo�no je, da po�tni stre�nik razkrije prejemnike z dodatkom glave "
+"Apparenlty-To (O�itno-za).\n"
 "Vseeno po�lji?"
 
 #: mail/mail-callbacks.c:359
@@ -6144,29 +6826,29 @@ msgstr "Navesti morate naslovnike, �e �eliti poslati sporo�ilo."
 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:655
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Na %s, je %s zapisal(a):"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporo�ilo:\n"
 
-#: mail/mail-callbacks.c:968
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Prestavi sporo�ilo(a) v"
 
-#: mail/mail-callbacks.c:970
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporo�ilo(a) v"
 
-#: mail/mail-callbacks.c:1325
+#: mail/mail-callbacks.c:1374
 #, 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:1347
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6174,7 +6856,7 @@ msgstr ""
 "Urejate lahko le sporo�ila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1381
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6182,36 +6864,24 @@ msgstr ""
 "Znova lahko po�ljete le sporo�ila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1393
+#: mail/mail-callbacks.c:1442
 #, 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:1414
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporo�ilo"
 
-#: mail/mail-callbacks.c:1448 mail/mail-display.c:98
-msgid "Overwrite file?"
-msgstr "Prepi�i datoteko?"
-
-#: mail/mail-callbacks.c:1452 mail/mail-display.c:102
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Datoteka z enakim imenom �e obstaja.\n"
-"Naj jo prepi�em?"
-
-#: mail/mail-callbacks.c:1496
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Shrani sporo�ilo kot..."
 
-#: mail/mail-callbacks.c:1498
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Shrani sporo�ila kot..."
 
-#: mail/mail-callbacks.c:1683
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6220,23 +6890,23 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1741
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtri"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Natisni sporo�ilo"
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Tiskanje sporo�ila ni uspelo"
 
-#: mail/mail-callbacks.c:1883
+#: mail/mail-callbacks.c:1966
 #, 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?"
 
-#: mail/mail-config.c:1561 mail/mail-config.c:1564
-msgid "Connecting to server..."
-msgstr "Vzpostavljam povezavo s stre�nikom..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6281,10 +6951,14 @@ msgstr ""
 "ra�un. Ime bo uporabljeno le za prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolucijin �arovnik za ra�une"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Vzpostavljam povezavo s stre�nikom..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Preveri za podprte tipe"
@@ -6294,58 +6968,63 @@ msgid " color"
 msgstr " barvo"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Podpisovanje v tem kodirniku ni podprto"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Ra�un"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Podatki o ra�unu"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Upravljanje z ra�unom"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Ra�uni"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 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
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Kadar po�iljam �ifrirano po�to, vedno �ifriraj sebi"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Vedno nalo�i slike s spleta"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Na�in avtentifikacije: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Samodejno preveri za novo po�to vsakih"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID certifikata:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6361,244 +7040,273 @@ msgstr ""
 "\n"
 "Kliknite \"Kon�aj\" za shranitev va�ih nastavitev."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "Privzet na�in \"Posreduj naprej\" je: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Mapa osnutkov:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-po�tni naslov:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "Ob izhodu sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Vklju�i"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "Podpis HTML:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "V po�ti HTML"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Kot del sporo�ila"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Nalo�i slike, �e je po�iljatelj v adresarju"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Nastavitev po�te"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Tip po�tnega predala"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Naj bo to moj privzet ra�un"
 
-#: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Ozna�i sporo�ila kot \"Prebrana\" po:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "Stre�nik NNTP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Nikoli ne nalo�i slik s spleta"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Podatki po �elji"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "ID klju�a PGP:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Pot do izvr�ljive datoteke PGP"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Dodajam sporo�ilo brez navedene zadeve"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Ne morem poslati sporo�ila: ni naslovnikov."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Po�tni imenik Qmail"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Sprejemam e-po�to"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Sprejemanje po�te"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Mo�nosti sprejema"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Privzeto po�lji po�to v HTML obliki."
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Po�iljam e-po�to"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Po�iljanje po�te"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporo�ila in osnutki"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Mapa poslanih sporo�il:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Nastavitev stre�nika"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Vrsta stre�nika:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Stre�nik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Obi�ajnen Unix po�tni predal"
 
-#: mail/mail-config.glade.h:94
-msgid "Type"
-msgstr "Vrsta"
-
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Uporabi varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Uporabni�ko ime:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6608,226 +7316,228 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za za�etek. "
 
-#: mail/mail-config.glade.h:102 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:47
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "dr�alec mesta"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "Nisem mogel ustvariti konteksta �ifiranja PGP."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "Nisem mogel ustvariti konteksta de�ifriranja PGP."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nisem mogel ustvariti konteksta �ifriranja S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta de�ifriranja S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:332
-#, c-format
-msgid "Open in %s..."
-msgstr "Odpri v %s..."
-
-#: mail/mail-display.c:334
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:369
-msgid "External Viewer"
-msgstr "zunanjem pregledovalniku"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:396
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:1028
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "zunanjem pregledovalniku"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporo�ila"
 
-#: mail/mail-display.c:1371
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1373
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1375
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1377
-msgid "Save Image as"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
 msgstr "Shrani sliko kot"
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d minut"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d sekund"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 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:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-po�tni naslov:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Program GPG/PGP ni nastavljen."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "�ifrirano sporo�ilo ni prikazano"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "�ifrirano sporo�ilo"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za de�ifriranje."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1377
 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:1182
+#: mail/mail-format.c:1388
 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:1833
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2060
 #, 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:1849
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Kazalec na FTP povezavo (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Napa�no oblikovano dodatno telo sporo�ila."
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr "Prenastavljam mapo"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr "Zapiram trenutno mapo"
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr "Preimenujem in odpiram staro mapo"
-
-#: mail/mail-local.c:856
-msgid "Creating new folder"
-msgstr "Ustvari novo mapo"
-
-#: mail/mail-local.c:870
-msgid "Copying messages"
-msgstr "Kopiram sporo�ilo"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6836,7 +7546,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste ve� mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6844,12 +7554,17 @@ msgstr ""
 "�e ne morete ve� odpreti tega po�tnega predala, potem\n"
 "ga boste morda morali popraviti ro�no."
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Ne morete kopirati sporo�il iz te mape smeti."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znova nastavi %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6858,7 +7573,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6867,110 +7582,104 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Napredek evolucije"
-
-#: mail/mail-ops.c:547
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Po�iljam \"%s\""
 
-#: mail/mail-ops.c:551
-msgid "Sending message"
-msgstr "Po�iljam sporo�ilo"
-
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Po�iljam sporo�ilo %d od %d"
 
-#: mail/mail-ops.c:681
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporo�ilu %d od %d"
 
-#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Kon�ano."
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Shranjujem sporo�ilo v mapo"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporo�ila v %s"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporo�ia v %s"
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:956
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osve�ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1118
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Smeti"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Posredovana sporo�ila"
 
-#: mail/mail-ops.c:1159 mail/mail-ops.c:1297
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1226
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Osve�ujem mapo"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Uni�ujem mapo"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prena�am sporo�ilo %s"
 
-#: mail/mail-ops.c:1649
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Prena�am sporo�ilo"
 
-#: mail/mail-ops.c:1659
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Prena�am sporo�ilo �tevilka %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1733
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Shranjujem sporo�ila"
 
-#: mail/mail-ops.c:1812
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6979,12 +7688,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1825
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Shranjujem sporo�ilo %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6993,11 +7697,11 @@ msgstr ""
 "Napaka ob shranjevanju sporo�il v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7006,12 +7710,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1956
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
@@ -7020,23 +7724,33 @@ msgstr "Odklapljam se od %s"
 msgid "(Untitled Message)"
 msgstr "(Neimenovano sporo�ilo)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Neimenovano sporo�ilo)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Kopiraj sporo�ilo"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Poi��i v sporo�ilu"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male �rke"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "I��i naprej"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Poi��i"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Ustreza:"
 
@@ -7068,111 +7782,108 @@ msgstr "Po�iljam"
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-tools.c:159
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Uporabnik je dejanje preklical."
+
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nisem mogel ustvariti za�asnega po�tnega predala `%s': %s"
 
-#: mail/mail-tools.c:207
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (posredovano sporo�ilo)"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Posreduj: (ni zadeve)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporo�ilo %s"
 
-#: mail/mail-tools.c:236
-msgid "Forwarded message (no subject)"
-msgstr "Posredovano sporo�ilo (brez navedene zadeve)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Posredovana sporo�ila"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Posredovano sporo�ilo-----<br><b>Od:</b> %s<br><b>Za:</b> %"
-"s<br><b>Predmet:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Posredovana sporo�ila"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "ve� nevidenih sporo�il"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Ve� sporo�il"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "najni�ja"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "najvi�ja"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "V�eraj %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Nitim seznam sporo�il"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Ozna�eno"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Sprejeto"
 
@@ -7180,10 +7891,6 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/mail-session.c:170
-msgid "User canceled operation."
-msgstr "Uporabnik je dejanje preklical."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapa"
@@ -7228,43 +7935,87 @@ msgstr "Tovarna za Evolucijine komponente za povzetke."
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
 
-#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Zmeneki"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Ni zmenkov"
 
-#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
-msgid "%I:%M%p"
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Povzetek po�te"
 
-#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Dodaj novi�arski stre�nik"
+
+#: my-evolution/e-summary-preferences.c:877
+#, fuzzy
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Vpi�ite ime ra�unalnika na katerem te�e novi�arski stre�nik."
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "_Nastavive Moje Evolucije..."
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Napaka ob nalaganju datoteke koledarja."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Napaka ob prena�anju RDF</b>"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Nova naloga"
+
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:296
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Napaka ob prena�anju Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: my-evolution/e-summary-weather.c:612
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "Obmo�ja"
 
-#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Natisni Mojo evolucijo"
 
-#: my-evolution/e-summary.c:459
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "Tiskanje Moje evolucije ni uspelo"
 
@@ -7272,95 +8023,95 @@ msgstr "Tiskanje Moje evolucije ni uspelo"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Jasno"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Prete�no obla�no"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Delno obla�no"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Prete�no jasno"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Obla�no"
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "Neveljavno"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Spremenljivo"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "sever"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "sever - severovzhod"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "severovzhod"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "vzhod - severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "vzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "vzhod - jugovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "jugovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "jug - jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "jug"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "jug - jugozahod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "jugozahod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "zahod - jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "zahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "zahod - severozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "severozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
@@ -7368,1062 +8119,1194 @@ msgstr "sever - severozahod"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "Pr�enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Pr�enje v okolici"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "Rahlo pr�enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Zmerno pr�enje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "Mo�no pr�enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "Plitvo pr�enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr "Ponekod pr�i"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr "Pr�i s presledki"
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr "Pr�enje z vetrom"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr "Pr�enje v pasovih"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr "Zmrzujo�e pr�enje"
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "De�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "De� v okolici"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Rahel de�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Zmeren de�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "Mo�an de�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "Plitev de�"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr "Ponekod de�uje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr "De�uje s presledki"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr "De� z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
 msgstr "De� v pasovih"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Freezing rain"
 msgstr "Zmrzujo� de�"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "Sne�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Sne�i v okolici"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Rahlo sne�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Zmerno sne�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "Mo�no sne�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "Plitvo sne�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr "Ponekod sne�i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr "Sne�i s presledki"
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Sne�na nevihta"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr "Sne�i z vetrom"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr "Sne�ne plohe"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr "Sne�i v pasovih"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr "Zmrzujo�e sne�i"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr "Zrnato sne�i v okolici"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr "Rahlo zrnato sne�i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr "Zmerno zrnato sne�i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr "Mo�no zrnato sne�i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr "Plitvo zrnato sne�i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr "Ponekod zrnato sne�i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr "Zrnato sne�i s presledki"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr "Zrnato sne�i z vetrom"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Drifting snow grains"
 msgstr "Zrnato sne�i v pasovih"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr "Zmrzujo�e zrnato sne�i"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr "Mo�ne ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr "Zmrzujo�e ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr "Babje p�eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr "Babje p�eno v okolici"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr "Nekaj babjega p�ena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr "Zmerno babje p�eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr "Mo�no babje p�eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr "Plitvo babje p�eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr "Ponekod babje p�eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr "Babje p�eno s presledki"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr "Nevihta babjega p�ena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr "Babje p�eno z vetrom"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr "Plohe babjega p�ena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr "Babje p�eno v pasovih"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr "Zmrzujo�e babje p�eno"
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail"
 msgstr "To�a"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr "To�a v okolici"
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr "Rahla to�a"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr "Zmerna to�a"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr "Mo�na to�a"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr "Plitva to�a"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr "Ponekod to�a"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Partial hail"
 msgstr "To�a s presledki"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr "Nevihta to�e"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr "To�a z vetrom"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr "Ploha to�e"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr "To�a v pasovih"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Freezing hail"
 msgstr "Zmrzujo�a to�a"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr "Mo�na sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr "Zmrzujo�a sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr "Mo�ne padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Freezing precipitation"
 msgstr "Zmrzujo�e padavine"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr "Zmrzujo�e meglice"
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr "Zmrzujo�a megla"
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr "Dim z grmenjem"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr "Vulkanski dim z grmenjem"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr "Plohe vulkanskega dima"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr "Zmrzujo� vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr "Mo�an pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr "Zmrzujo�a suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays"
 msgstr "Pr�ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr "Pr�ec v okolici"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr "Rahel pr�ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr "Zmeren pr�ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr "Mo�an pr�ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr "Plitev pr�ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr "Ponekod pr�ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr "Pr�ec s presledki"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr "Pr�ec z vetrom"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr "Pr�ec v pasovih"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr "Zmrzujo� pr�ec"
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr "Pi� vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr "Pi� vetra v okolici"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr "Rahel pi� vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr "Zmeren pi� vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr "Mo�an pi� vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr "Pi� vetra s presledki"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr "Pi� vetra z grmenjem"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr "N��en pi� vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr "Pi� vetra v pasovih"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr "Zmrzujo� pi� vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr "Pe��eni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr "Pe��eni vihar v okolici"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr "Rahel pe��eni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr "Zmeren pe��eni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr "Mo�an pe��eni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr "Plitev pe��eni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr "Pe��eni vihar s presledki"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr "Pe��eni vihar z grmenjem"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr "N�sen pe��eni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr "Pe��eni vihar v pasovih"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr "Zmrzujo� pe��eni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr "Pra�ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr "Pra�ni vihar v okolici"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr "Rahel pra�ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr "Zmeren pra�ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr "Mo�an pra�ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr "Plitev pra�ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr "Pra�ni vihar s presledki"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr "Pra�ni vihar z grmenjem"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr "N�sen pra�ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr "Pra�ni vihar v pasovih"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr "Zmrzujo� pra�ni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Tornado v okolici"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr "Zmrzujo� tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr "Pra�ni vrtinec"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr "Pra�ni vrtinci v okolici"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr "Rahli pra�ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr "Zmerni pra�ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr "Mo�ni pra�ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr "Plitvi pra�ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr "Ponekod pra�ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr "Pra�ni vrtinci s presledki"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr "Pra�ni vrtinci z vetrom"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr "Pra�ni vrtinci v pasovih"
 
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Dodaj novi�arski stre�nik"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Vse mape"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Vsi udele�eni"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Prika�i mape, ki se za�nejo z:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Poka�i mo�nosti"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Prikaz"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "petek"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Nastavitve"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Novi�arski stre�niki"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 dan"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mesec"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 teden"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Na�rtuj\n"
+"�as"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Ka�i vse"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Ka�i celotne _glave"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Naloge"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Enota:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Moje vreme"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Preveri nastavitve"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "april"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolucijina lupina."
+
 #: shell/e-activity-handler.c:198
 msgid "Show Details"
 msgstr "Ka�i podrobnosti"
@@ -8432,7 +9315,12 @@ msgstr "Ka�i podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekli�i operacijo"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Posebne mape"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
@@ -8453,21 +9341,17 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Evolucijine datoteke so se uspe�no namestile."
-
-#: shell/e-setup.c:202
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Ka�e, da je to va� prvi zagon Evolucije."
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabni�kih datotek "
 "pod"
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8478,16 +9362,14 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:237
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Ne morem kopirati datotek v\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8498,7 +9380,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabni�kih datotek nadaljuje."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8512,7 +9394,7 @@ msgstr ""
 "lahko Evolucija po�ene.\n"
 "�elite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8523,56 +9405,56 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabni�kih datotek nadaljuje."
 
-#: shell/e-shell.c:446
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Ne morem dobiti mape: %s: %s"
 
-#: shell/e-shell.c:1308
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Ne morem kopirati datotek v\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"Opa!  Pogled `%s' je nepri�akovano umru.  :-(\n"
-"To verjetno pomeni, da se je komponenta %s sesula."
 
-#: shell/e-shell-folder-commands.c:242
+#: shell/e-shell-folder-commands.c:270
 #, 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:247
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:313
 #, 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:290
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#. Popup a dialog asking if they are sure they want to delete
-#. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Zbri�i mapo '%s'"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:363
 #, 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:390
+#: shell/e-shell-folder-commands.c:422
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Preimenuj mapo '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -8581,11 +9463,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Izbrano ime mape ni veljavno."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -8597,11 +9479,11 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -8710,51 +9592,19 @@ msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view.c:173
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
-msgid "My Evolution"
-msgstr "Moja Evolucija"
-
-#: shell/e-shell-view.c:1403
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1405
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell-view.c:1443
-msgid "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:1450
-msgid "Evolution is in the process of going offline."
-msgstr "Evolucija je v procesu odklapljanja z mre�e."
-
-#: shell/e-shell-view.c:1456
-msgid "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-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 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:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogo�e pognati."
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Avtorske pravice pridr�ane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -8764,55 +9614,87 @@ msgstr ""
 "GNOME za delo v skupinah, za po�to, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:464
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo �elite odpreti"
 
-#: shell/e-shell-view-menu.c:610
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bli�njico"
 
-#: shell/e-shell-view-menu.c:611
+#: shell/e-shell-view-menu.c:584
 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:718
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Delaj na mre�i"
 
-#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Delaj brez mre�e"
 
-#: shell/e-shortcuts.c:601
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bli�njic."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shortcuts.c:998
-msgid "Shortcuts"
-msgstr "Bli�njice"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "Moja Evolucija"
 
-#: shell/e-shortcuts.c:1000
-msgid "Inbox"
-msgstr "Dohodna po�ta"
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolucija %s"
 
-#: shell/e-shortcuts.c:1003
-msgid "Contacts"
-msgstr "Stik"
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolucija %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "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:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolucija je v procesu odklapljanja z mre�e."
+
+#: shell/e-shell-view.c:1464
+msgid "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-shortcuts-view.c:136
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Opa!  Pogled `%s' je nepri�akovano umru.  :-(\n"
+"To verjetno pomeni, da se je komponenta %s sesula."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bli�njic"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -8821,156 +9703,191 @@ msgstr ""
 "Zares �elite odstraniti skupino\n"
 "`%s' iz vrstice bli�njic?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bli�njic"
 
-#: shell/e-shortcuts-view.c:293
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bli�njic v:"
 
-#: shell/e-shortcuts-view.c:303
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:304
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Ka�i bli�njice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:306
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:307
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Ka�i bli�njice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:319
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bli�njic"
 
-#: shell/e-shortcuts-view.c:321
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:322
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bli�njic"
 
-#: shell/e-shortcuts-view.c:324
-msgid "Re_name This Group..."
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bli�njic"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bli�njicami"
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bli�njicami"
 
-#: shell/e-shortcuts-view.c:450
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Preimenuj bli�njico"
 
-#: shell/e-shortcuts-view.c:451
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bli�njico v:"
 
-#: shell/e-shortcuts-view.c:463
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Odpri"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bli�njico"
 
-#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: shell/e-shortcuts-view.c:465
+#: shell/e-shortcuts-view.c:476
 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:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bli�njico"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bli�njico iz vrstice bli�njic"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Napaka ob shranjevanju bli�njic."
+
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
+msgstr "Bli�njice"
+
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr "Dohodna po�ta"
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
+msgstr "Stik"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Generi�na napaka"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom �e obstaja"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
-#, c-format
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kon�ano)"
 
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Prekinjam povezave..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Gostitelj:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ime mape:"
@@ -8983,10 +9900,6 @@ msgstr "Vrsta mape:"
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolucijina lupina."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite \"Uvozi\" za pri�etek uvoza datoteke v Evolucijo. "
@@ -9017,22 +9930,26 @@ msgstr "Uvozniki"
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/main.c:89
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Ne spra�uj me ve�"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -9054,7 +9971,7 @@ msgstr ""
 "Upamo, da boste u�ivali sadove na�ega trdega dela in nestrpno\n"
 "pri�akujemo va�e prispevke!\n"
 
-#: shell/main.c:114
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9062,28 +9979,28 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:152
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Ne morem dostopati do lupine Evolucije."
 
-#: shell/main.c:212
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Izklju�i za�etni zaslon"
 
-#: shell/main.c:213
+#: shell/main.c:216
 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:248
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "_Izre�i"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopiraj"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
@@ -9095,7 +10012,11 @@ msgstr "Ustvari nov stik"
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Izre�i"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Izre�i izbrano"
 
@@ -9111,7 +10032,11 @@ msgstr "Nov stik"
 msgid "New list"
 msgstr "Nov seznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Prilepi"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Prilepi odlo�i��e"
 
@@ -9151,19 +10076,8 @@ msgstr "_Stik"
 msgid "_Contact Group"
 msgstr "Skupina _stikov"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Na_tisni..."
 
@@ -9175,171 +10089,132 @@ msgstr "_I��i po kontaktih"
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dni"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Nastavi veznik adresarja"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Ustvari nov celodnevni dogodek"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Ustvari nov koledar"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dan"
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create an event for the whole day"
+msgstr "Ustvari nov zmenek za danes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Pojdi po �asu nazaj"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Pojdi po �asu naprej"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Pojdi na _danes"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Pojdi na dolo�en datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Mesec"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Nov _dogodek"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-msgid "Next"
-msgstr "Naslednje"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Odpri koledar"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Nazaj"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nov zmenek"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Natisni koledar"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy Information"
 msgstr "Objavi podatek o zasedenosti"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Shrani kot"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Shrani koledar kot nekaj drugega"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Nastavitve..."
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Ka�i en dan"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Ka�i en mesec"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Ka�i en teden"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Poka�i delavni teden"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-msgid "Today"
-msgstr "Danes"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_Delavni teden"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Teden"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Zmenek"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Nastavive po�te..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Dan"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mesec"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:57
-msgid "_New"
-msgstr "_Nova"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "Odpri ko_ledar"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Teden"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zapri"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Zapri"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9350,7 +10225,7 @@ msgid "Delete this appointment"
 msgstr "Zbri�i ta zmenek"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -9358,7 +10233,7 @@ msgstr "Glavna orodna vrstica"
 msgid "Preview the printed item"
 msgstr "Predogled natisnjenega predmeta"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
@@ -9367,22 +10242,15 @@ msgid "Print S_etup"
 msgstr "Nastavitev t_iskanja"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Shrani kot..."
-
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
@@ -9402,18 +10270,15 @@ msgstr "Nastavi lastnosti strani za va� trenutni tiskalnik"
 msgid "_Action"
 msgstr "_Dejanje"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:52
-msgid "_Help"
-msgstr "_Pomo�"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Zbri�i ta predmet"
@@ -9428,13 +10293,12 @@ msgid "Help"
 msgstr "Pomo�"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
@@ -9455,26 +10319,31 @@ msgid "Send _message to contact..."
 msgstr "Po�lji _sporo�ilo stiku..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Shrani"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Zbri�i to skupino"
+#, fuzzy
+msgid "Delete this list"
+msgstr "Zbri�i ta predmet"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Shrani skupino in zapri pogovorno okno"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "_Po�lji skupino drugim..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Po�lji stik drugim..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "Po�lji _sporo�ilo skupini..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Po�lji _sporo�ilo stiku..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -9509,7 +10378,7 @@ msgid "Schedule a meeting for this item"
 msgstr "Na�rtuj sestanek za ta predmet"
 
 #: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "_Dejanja"
 
@@ -9530,78 +10399,83 @@ msgid "Compose"
 msgstr "Sestavi"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Sestavi novo sporo�ilo"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Ustvari ali uredi po�tne ra�une in ostale nastavitve"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Ustvari ali uredi pravila za filtriranje nove po�te"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Ustvari ali uredi dolo�itve navideznih map"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vpra�ani"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "Uredi _naro�nine..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Odpri okno za sestavljanje novega po�tnega sporo�ila"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno odstrani vsa zbrisana sporo�ila iz vseh map"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Po�lji po�to v vrsti in sprejmi novo po�to"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Ka�i okno predogleda sporo�ila"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Naro�i se ali prekli�i naro�nino na mape z oddaljenih stre�nikov"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_Po�lji sporo�ilo"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Nastavive po�te..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
@@ -9626,7 +10500,8 @@ msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporo�ila"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Skrij _prebrana sporo�ila"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -9694,7 +10569,7 @@ msgstr "Niten seznam sporo�il"
 msgid "_Expunge"
 msgstr "_Uni�i"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -9702,7 +10577,7 @@ msgstr "_Mapa"
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
@@ -9795,19 +10670,23 @@ msgid "Display the previous unread message"
 msgstr "Ka�i prej�nje neprebrano sporo�ilo"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_o�tni seznam"
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filter glede na po�ilja_telja"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike"
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -9850,198 +10729,238 @@ msgstr "Nekomu posreduj izbrano sporo�ilo"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporo�ilo kot prilogo"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Nalo�i _slike"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "Ozna�i _kot prebrano"
-
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As I_mportant"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
 msgstr "Ozna�i kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Mark As U_nread"
-msgstr "Ozna�i kot _neprebrano"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Ozna�i kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Ozna�i izbrana sporo�ila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Ozna�i izbrana sporo�ila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Ozna�i izbrana sporo�ila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Ozna�i izbrana sporo�ila kot pomembna"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Ozna�i izbrana sporo�ila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Prestavi izbrana sporo�ila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Naslednje"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Naslednje sporo�ilo"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Naslednje sporo�ilo"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Izberi ni_t"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Naslednje sporo�ilo"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporo�ilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 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:51
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Predogled sporo�ika, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Prej�nje"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Prej�nje sporo�ilo"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Prej�nje sporo�ilo"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Prej�nje sporo�ilo"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Natisni sporo�ilo..."
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Predogled tiskanja..."
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Print message to the printer"
-msgstr "Natisni sporo�ilo na tiskalniku"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr "Preusmeri (FIXME: implementiraj me)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Natisni sporo�ilo"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_I��i v sporo�ilu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Shrani sporo�ilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 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:65
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Ka�i _izvor po�te"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Ka�i celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Ka�i sporo�ila v obi�ajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Ka�i sporo�ila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Ka�i neposredno izvorno kodo sporo�ila"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Odbri�i izbrana sporo�ila"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na po�tni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _po�iljatelja..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Iz sporo�ila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Sporo�ilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Prikaz _sporo�ila"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Obi�ajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Odpri sporo�ilo"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Znova po�lji sporo�ilo"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
 msgstr "_Prilagodi orodne vrstice..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 msgid "Customize"
 msgstr "Prilagodi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
 msgid "Customize toolbars"
 msgstr "Prliagodi orodne vrstice"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 msgid "_View"
 msgstr "Po_gled"
 
@@ -10049,11 +10968,7 @@ msgstr "Po_gled"
 msgid "Attach"
 msgstr "Prilo�i"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prilo�i datoteko"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
@@ -10078,50 +10993,57 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Vstavi datoteko z besedilom..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Vstavi datoteko v sporo�ilo kot besedilo"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Vstavi datoteko z besedilom..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "�ifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "�ifriraj z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Shrani"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "Shrani _osnutek"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Shrani kot"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Shrani v _mapo... (FIXME)"
+msgid "Save _Draft"
+msgstr "Shrani _osnutek"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
@@ -10194,33 +11116,36 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Priloga"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Razhro��uj"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Zbri�i vse"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Vstavi datoteko z besedilom..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Odpri..."
@@ -10233,6 +11158,10 @@ msgstr "Polje _Odgovori-na:"
 msgid "_Security"
 msgstr "_Varnost"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Pomo�"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naro�enih map"
@@ -10274,40 +11203,42 @@ msgid "Re_fresh Task"
 msgstr "Osve�i opravilo"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Nastavi veznik adresarja"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Izre�i izbrano opravilo"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Zbri�i izbrana opravila"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nova naloga"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odlo�i��a"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Shrani posel kot nekaj drugega"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Nastavi pogled opravila"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Nastavitve poslov..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Nastavitve opravil..."
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Nastavive po�te..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -10325,183 +11256,179 @@ msgstr "Dodaj v vrstico z _bli�njicami"
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Spremeni lastnosti te mape"
-
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Ustvari bli�njico na to mapo v vrstici bli�njic"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Zbri�i to mapo"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Poka�i drugo mapo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "_Pogosto zastavljena vpra�anja"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Kako _za�eti"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Ka�i podatke o Evoluciji"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Po�lji poro�ilo o hro��u"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Po�lji poro�ilo o hro��u"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Po�lji poro�ilo o hro��u z uporabo progama Bug buddy."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bli�njicami"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mre�o"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uporaba _po�te"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
 #: ui/evolution.xml.h:39
-msgid "Work Offline"
-msgstr "Delaj brez mre�e"
-
-#: ui/evolution.xml.h:40
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Po�lji sporo�ilo"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nova"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_Bli�njica"
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bli�njicami"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Naloga (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "_Delaj brez mre�e"
 
@@ -10525,22 +11452,6 @@ msgstr "Po podjetju"
 msgid "Phone List"
 msgstr "Seznam telefonov"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "Dnevni pogled"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Mese�ni pogled"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Tedenski pogled"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "Pogled delavnega tedna"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Po po�iljatelju"
@@ -10561,9 +11472,12 @@ msgstr "Sporo�ila"
 msgid "With Category"
 msgstr "S kategorijo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Poskusno"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -10637,13 +11551,6 @@ msgstr "�as zaklju�ka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udele�eni"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Trenutni pogled"
@@ -10654,19 +11561,18 @@ 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:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PTS�PSN"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Sedaj"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Danes"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "V redu"
@@ -10753,19 +11659,24 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Urejevalnik stikov"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Ka�i vse"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Napredno..."
 
@@ -10818,6 +11729,278 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Nastavi pogled opravila"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Nastavitve opravil..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Stiki..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Podjetje:"
+
+#~ msgid "(none)"
+#~ msgstr "(brez)"
+
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr ""
+#~ "Obvestilo o va�em dnevni�kem vpisu, ki se za�ne ob %s in kon�a ob %s"
+
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "Obvestilo o va�em dnevni�kem vpisu, ki se za�ne ob %s"
+
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "Obvestilo o va�em dnevni�kem vpisu, ki se kon�a ob %s"
+
+#~ 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"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Ka�i dialog"
+
+#~ msgid "Percent complete"
+#~ msgstr "Procentov opravljeno"
+
+#~ msgid "Edit this task"
+#~ msgstr "Uredi to opravilo"
+
+#~ msgid "Go to Today"
+#~ msgstr "Pojdi na danes"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Zbri�i vse pojavitve"
+
+#~ msgid "Summary contains"
+#~ msgstr "Povzetek vsebuje"
+
+#~ msgid "Description contains"
+#~ msgstr "Opis vsebuje"
+
+#~ msgid "Comment contains"
+#~ msgstr "Komentar vsebuje"
+
+#~ msgid "Has category"
+#~ msgstr "Ima kategorijo"
+
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now ne pri�akuje argumentov"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time pri�akuje 1 argument"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time pri�akuje, da je 1. argument niz"
+
+#~ 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"
+
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day pri�akuje 2 argumenta"
+
+#~ msgid "time-add-day expects argument 1 to be a time_t"
+#~ msgstr "time-add-day pri�akuje, da je 1. argument time_t"
+
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr "time-add-day pri�akuje, da je 2. argument celo �tevilo (integer)"
+
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin pri�akuje 1 argument"
+
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr "time-day-begin pri�akuje, da je 1. argument time_t"
+
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "time-day-end pri�akuje 1 argument"
+
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "time-day-end pri�akuje, da je 1. argument time_t"
+
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype ne pri�akuje argumentov"
+
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "occur-in-time-range? pri�akuje 2 argumenta"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "contains? pri�akuje 2 argumenta"
+
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? pri�akuje, da je 1. argument niz"
+
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? pri�akuje, da je 2. argument niz"
+
+#~ msgid ""
+#~ "contains? expects argument 1 to be one of \"any\", \"summary\", "
+#~ "\"description\""
+#~ msgstr ""
+#~ "contains? pri�akuje, da je 1. argument eden od \"any\" (karkoli), "
+#~ "\"summary\" (povzetek), \"description\"(opis)"
+
+#~ msgid "has-categories? expects at least 1 argument"
+#~ msgstr "has-categories? pri�akuje vsaj 1 argument"
+
+#~ msgid "has-categories? expects all arguments to be strings"
+#~ msgstr "has-categories? pri�akuje, da so vsi argumenti nizi"
+
+#~ 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)"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Pregledujem mapo IMAP"
+
+#~ msgid "Error opening file: %s"
+#~ msgstr "Napaka ob odpiranju datoteke: %s"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Posreduj na naslove"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Vzdevki programa Elm"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adresarji"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Prenastavljam mapo"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Zapiram trenutno mapo"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Preimenujem in odpiram staro mapo"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Ustvari novo mapo"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopiram sporo�ilo"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Napredek evolucije"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Prena�am sporo�ilo �tevilka %d od %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Shranjujem sporo�ilo %d od %d (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (posredovano sporo�ilo)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Posreduj: (ni zadeve)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Posredovano sporo�ilo (brez navedene zadeve)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Posredovano sporo�ilo-----<br><b>Od:</b> %s<br><b>Za:</b> "
+#~ "%s<br><b>Predmet:</b> %s<br>"
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Napaka ob prena�anju Metar</b>"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolucijine datoteke so se uspe�no namestile."
+
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alternativne nastavitve"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Ustvari nov koledar"
+
+#~ msgid "Day"
+#~ msgstr "Dan"
+
+#~ msgid "Month"
+#~ msgstr "Mesec"
+
+#~ msgid "New _Event"
+#~ msgstr "Nov _dogodek"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "Prev"
+#~ msgstr "Nazaj"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Shrani koledar kot nekaj drugega"
+
+#~ msgid "Settings..."
+#~ msgstr "Nastavitve..."
+
+#~ msgid "Week"
+#~ msgstr "Teden"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Odpri ko_ledar"
+
+#~ msgid "Delete this group"
+#~ msgstr "Zbri�i to skupino"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Shrani skupino in zapri pogovorno okno"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "_Po�lji skupino drugim..."
+
+#~ msgid "Send _message to group..."
+#~ msgstr "Po�lji _sporo�ilo skupini..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Ozna�i _kot prebrano"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Ozna�i kot _neprebrano"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Natisni sporo�ilo na tiskalniku"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Preusmeri (FIXME: implementiraj me)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Shrani v _mapo... (FIXME)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Vstavi datoteko z besedilom..."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Nastavitve poslov..."
+
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Spremeni lastnosti te mape"
+
 #~ msgid "As _Minicards"
 #~ msgstr "Kot _minivizitke"
 
@@ -10827,24 +12010,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Find..."
 #~ msgstr "Poi��i..."
 
-#~ msgid "%A, %e %B %Y"
-#~ msgstr "%A, %e %B %Y"
-
 #~ msgid "<b>Error loading calendar:<br>Method not supported"
 #~ msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
 
 #~ msgid "Alarms timeout after"
 #~ msgstr "Alarmi prete�ejo �ez"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Zvo�ni alarmi"
-
 #~ msgid "Colors"
 #~ msgstr "Barve"
 
-#~ msgid "Display options"
-#~ msgstr "Poka�i mo�nosti"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "Omogo�i podalj�anje spanja za"
 
@@ -10878,18 +12052,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Task"
 #~ msgstr "Uredi nalogo"
 
-#~ msgid "Appointment - %s"
-#~ msgstr "Zmenek - %s"
-
-#~ msgid "Task - %s"
-#~ msgstr "Naloga - %s"
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Vpis v dnevniku - %s"
-
-#~ msgid "No summary"
-#~ msgstr "Ni povzetka"
-
 #~ msgid "Mark Complete"
 #~ msgstr "Ozna�i kot opravljeno"
 
@@ -10902,9 +12064,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Component successfully updated."
 #~ msgstr "Komponenta je bila uspe�no posodobljena."
 
-#~ msgid "There was an error loading the calendar file."
-#~ msgstr "Napaka ob nalaganju datoteke koledarja."
-
 #~ msgid "I couldn't open your calendar file!\n"
 #~ msgstr "Nisem mogel odpreti datoteke koledarja!\n"
 
@@ -10929,21 +12088,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Add to Calendar"
 #~ msgstr "Dodaj _koledarju"
 
-#~ msgid " Accept "
-#~ msgstr " Sprejmi "
-
-#~ msgid " Decline "
-#~ msgstr " Zavrni "
-
 #~ msgid " Tentative "
 #~ msgstr " Poskusno "
 
 #~ msgid "Update Calendar"
 #~ msgstr "Posodobi koledar"
 
-#~ msgid "Attendee"
-#~ msgstr "Udele�en"
-
 #~ msgid "Attendee address"
 #~ msgstr "Naslov udele�enca"
 
@@ -10957,15 +12107,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Prekli�i\n"
 #~ "sestanek"
 
-#~ msgid "Chair"
-#~ msgstr "Stol"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Ne-sodelujo�i"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Mo�ni sodelujo�i"
-
 #~ msgid "Organizer: "
 #~ msgstr "Organizator: "
 
@@ -10976,25 +12117,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Objavi\n"
 #~ "dogodek"
 
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
-#~ msgid "Required Participant"
-#~ msgstr "Potrebni udele�enci"
-
-#~ msgid "Role"
-#~ msgstr "Vloga"
-
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "Na�rtuj\n"
-#~ "�as"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Uredi zmenek"
-
 #~ msgid "Appointment Basics"
 #~ msgstr "Osnove zmenkov"
 
@@ -11083,9 +12205,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Datoteka je zelo velika (�ez 100K).\n"
 #~ "Ste prepri�ani,da jo �elite vstaviti?"
 
-#~ msgid "An error occurred while reading the file."
-#~ msgstr "Ob branju datoteke se je zgodila napaka."
-
 #~ msgid "%I:%M:%S %p%n"
 #~ msgstr "%I:%M:%S %p%n"
 
@@ -11184,9 +12303,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Update automatically"
 #~ msgstr "Samodejno posodobi"
 
-#~ msgid "Update every "
-#~ msgstr "Posodobi vsakih"
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -11205,12 +12321,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Delete this message"
 #~ msgstr "Zbri�i to spor�ilo"
 
-#~ msgid "Previous message"
-#~ msgstr "Prej�nje sporo�ilo"
-
-#~ msgid "Next message"
-#~ msgstr "Naslednje sporo�ilo"
-
 #~ msgid "Activate"
 #~ msgstr "Aktiviraj"
 
@@ -11274,9 +12384,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "In_complete Task (FIXME)"
 #~ msgstr "Ne_popolna naloga (FIXME)"
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "Spremeni lastnosti datoteke"
-
 #~ msgid "N_ext"
 #~ msgstr "Napr_ej"
 
@@ -11388,9 +12495,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Remove the selected folder"
 #~ msgstr "Odstrani izbrano mapo"
 
-#~ msgid "_Remove"
-#~ msgstr "_Odstrani"
-
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -11418,9 +12522,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Uveljavi vse nove filtre po�ti tega predala"
 
-#~ msgid "Compose a new message"
-#~ msgstr "Sestavi novo sporo�ilo"
-
 #~ msgid "Configure Folder..."
 #~ msgstr "Nastavi mapo..."
 
@@ -11479,15 +12580,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Po�lji �akajo�o po�to\n"
 #~ "    in sprejmi novo"
 
-#~ msgid "Undelete"
-#~ msgstr "Odbri�i"
-
 #~ msgid "View Raw Message Source"
 #~ msgstr "Glej izvorno obliko sporo�ila"
 
-#~ msgid "_Attachment"
-#~ msgstr "_Priloga"
-
 #~ msgid "_Reply"
 #~ msgstr "_Odgovori"
 
@@ -11552,8 +12647,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "�ISTO"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism "
-#~ "if the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
 #~ msgstr ""
 #~ "Ta mo�nost narekuje povezavo s stre�nikom z uporabo �ISTEGA SASL "
 #~ "mehanizma,�e stre�nik to podpira."
@@ -11574,23 +12669,23 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Varni POP"
 
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol "
-#~ "can also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
 #~ "Za povezovanje s stre�niki POP preko povezave SSL. Protokol POP se lahko "
-#~ "uporabi tudi za prena�anje po�te iz nekaterih spletnih nuditeljev po�te "
-#~ "in zaprtih sistemov e-po�te."
+#~ "uporabi tudi za prena�anje po�te iz nekaterih spletnih nuditeljev po�te in "
+#~ "zaprtih sistemov e-po�te."
 
 #~ msgid "Secure SMTP"
 #~ msgstr "Varni SMTP"
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
-#~ "SSL connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
 #~ msgstr ""
-#~ "Za dostavo po�te preko povezave z oddaljenim po�tnim razdelilcem z "
-#~ "uporabo SMTP preko povezave SSL.\n"
+#~ "Za dostavo po�te preko povezave z oddaljenim po�tnim razdelilcem z uporabo "
+#~ "SMTP preko povezave SSL.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -11605,18 +12700,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Advanced"
 #~ msgstr "Napredno"
 
-#~ msgid "Check settings"
-#~ msgstr "Preveri nastavitve"
-
 #~ msgid "Email address:"
 #~ msgstr "E-po�tni naslov:"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Nastavitev Evolucijine po�te"
 
-#~ msgid "Hostname:"
-#~ msgstr "Ime gostitelja:"
-
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
@@ -11663,8 +12752,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Type the name by which you would like to refer to these servers. For "
 #~ "example: \"Work\" or \"Home\"."
 #~ msgstr ""
-#~ "Vpi�ite ime s katerimi �elite nazivati te stre�nike. Na primer:\"slu�beni"
-#~ "\" ali \"doma�i\"."
+#~ "Vpi�ite ime s katerimi �elite nazivati te stre�nike. Na primer:\"slu�beni\" "
+#~ "ali \"doma�i\"."
 
 #~ msgid "minutes."
 #~ msgstr "minut."
@@ -11745,9 +12834,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Ob prena�anju seznama pilotov z gnome-pilot\n"
 #~ "daemona se je zgodila napaka"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "Nastavi veznik adresarja"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolucijin veznik adresarja "
 
@@ -11791,9 +12877,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "This option will connect to the SMTP server without using any kind of "
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ msgstr ""
-#~ "Ta mo�nost narekuje povezavo s stre�nikom SMTP brez uporabe "
-#~ "avtentifikacije. To bi moralo biti v redu za povezavo z ve�ino stre�niki "
-#~ "SMTP."
+#~ "Ta mo�nost narekuje povezavo s stre�nikom SMTP brez uporabe avtentifikacije. "
+#~ "To bi moralo biti v redu za povezavo z ve�ino stre�niki SMTP."
 
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Uredi pravilo filtra"
@@ -11912,9 +12997,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Ka�i vrstico z bli�njicami"
 
-#~ msgid "Saving changes to message..."
-#~ msgstr "Shranjujem spremembe sporo�ila..."
-
 #~ msgid "Save changes to message..."
 #~ msgstr "Shranjujem spremembe sporo�ila..."
 
@@ -11945,9 +13027,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Dodajam \"%s\""
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Dodajam sporo�ilo brez navedene zadeve"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "Prestavljam sporo�ila iz \"%s\" v \"%s\""
 
@@ -11998,9 +13077,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "Prekli�i naro�nino na mapo \"%s\""
 
-#~ msgid "All Folders"
-#~ msgstr "Vse mape"
-
 #~ msgid "Display folders whose name contain:"
 #~ msgstr "Prika�i mape, katerih ime vsebuje:"
 
@@ -12045,9 +13121,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Krajevno hranjenje nima privzete mape"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Krajevnih map ni mogo�e gnezditi."
-
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
 #~ "Opomba: Med pretvarjanjem med razli�nimi oblikami po�tnih predalov\n"
@@ -12262,9 +13335,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: _Note"
 #~ msgstr "FIXME: _Opomba"
 
-#~ msgid "Group %i"
-#~ msgstr "Skupina %i"
-
 #~ msgid "Failed to perform regex search on message header: %s"
 #~ msgstr ""
 #~ "Nisem uspel izvesti iskanja z regularnimi izrazi v glavah sporo�il: %s"
@@ -12348,8 +13418,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana "
-#~ "znotraj Evolucije.\n"
+#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
+#~ "Evolucije.\n"
 #~ "\n"
 #~ "Vendar se bo zmenek ponovil pravo�asno in bo  pravilno prikazan v pogledu "
 #~ "koledarja."
@@ -12441,9 +13511,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "twelfth"
 #~ msgstr "dvanajsti"
 
-#~ msgid "ago"
-#~ msgstr "nazaj"
-
 #~ msgid "Create to-do item"
 #~ msgstr "Ustvari opravilo"
 
@@ -12517,9 +13584,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Preferences"
 #~ msgstr "Nastavitve"
 
-#~ msgid "Alarm Properties"
-#~ msgstr "Lastnosti alarma"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Piskaj ob zaslonskih alarmih"
 
@@ -12536,8 +13600,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "Za branje po�te dostavljene na krajevni sistem in za shranjevanje po�te "
-#~ "na krajevni disk."
+#~ "Za branje po�te dostavljene na krajevni sistem in za shranjevanje po�te na "
+#~ "krajevni disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj �e obstaja"
@@ -12567,20 +13631,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Custom search"
 #~ msgstr "Iskanje po meri"
 
-#~ msgid "Copy Message"
-#~ msgstr "Kopiraj sporo�ilo"
-
 #~ msgid "You have no mail sources configured"
 #~ msgstr "Nimate nastavljenih izvorov po�te"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may "
-#~ "also, optionally, enter the name of your organization, and the name of a "
-#~ "file to read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
 #~ msgstr ""
-#~ "Vnesite svoje ime in e-po�tni naslov, ki naj se uporablja v izhodni po�ti "
-#~ "Po �elji lahko vnesete tudi ime va�e organizacije in ime datoteke iz "
-#~ "katere naj se prebere va� podpis."
+#~ "Vnesite svoje ime in e-po�tni naslov, ki naj se uporablja v izhodni po�ti Po "
+#~ "�elji lahko vnesete tudi ime va�e organizacije in ime datoteke iz katere naj "
+#~ "se prebere va� podpis."
 
 #~ msgid "Signature File"
 #~ msgstr "Datoteka s podpisom"
@@ -12589,11 +13650,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Tip izvora po�te:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Izberite vrsto po�tnega stre�nika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -12602,11 +13663,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Izberite vrsto po�tnega stre�nika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -12626,9 +13687,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Source"
 #~ msgstr "Uredi izbor"
 
-#~ msgid "Add News Server"
-#~ msgstr "Dodaj novi�arski stre�nik"
-
 #~ msgid "Edit News Server"
 #~ msgstr "Uredi novi�arski stre�nik"
 
@@ -12658,9 +13716,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Identities"
 #~ msgstr "Identitete"
 
-#~ msgid "News Servers"
-#~ msgstr "Novi�arski stre�niki"
-
 #~ msgid "News Sources"
 #~ msgstr "Viri novic"
 
@@ -12704,11 +13759,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Posreduj sporo�ilo \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded "
-#~ "message."
+#~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
-#~ "Nisem uspel generirati mime dela iz sporo�ila med generiranjem "
-#~ "posredovanega sporo�ila."
+#~ "Nisem uspel generirati mime dela iz sporo�ila med generiranjem posredovanega "
+#~ "sporo�ila."
 
 #~ msgid "Loading \"%s\""
 #~ msgstr "Nalagam \"%s\""
@@ -12755,9 +13809,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Rebuild message view"
 #~ msgstr "Obnovi pogled sporo�il"
 
-#~ msgid "Threading message list"
-#~ msgstr "Nitim seznam sporo�il"
-
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ov stre�nik imenikov"
 
@@ -12830,9 +13881,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nov zmenek za _danes..."
 
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Ustvari nov zmenek za danes"
-
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
 
@@ -12886,9 +13934,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Obi�ajna\n"
 #~ "Nizka\n"
 
-#~ msgid "Resources:"
-#~ msgstr "Viri:"
-
 #~ msgid "Last Modification Date"
 #~ msgstr "Datum zadnje spremembe"
 
@@ -13116,8 +14161,5 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Select the method you would like to use to deliver your mail."
 #~ msgstr "Izberite na�in na katerega �elite dostavljati va�o po�to."
 
-#~ msgid "Enter the hostname of the News Server you have."
-#~ msgstr "Vpi�ite ime ra�unalnika na katerem te�e novi�arski stre�nik."
-
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "Ne morem inicializirati nastavitvenega sistema."
diff --git a/po/sv.po b/po/sv.po
index a5b0398b64..2c9e373ca3 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.96 2001/07/30 19:33:37 menthos Exp $
+# $Id: sv.po,v 1.97 2001/07/31 19:28:47 ettore Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-30 21:30+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-30 21:31+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -327,8 +327,8 @@ msgstr "VCard f�r %s"
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:46
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:1017
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
@@ -342,14 +342,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook inte inl�st\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/todo/todo-conduit.c:591
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:777
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
@@ -455,7 +455,7 @@ msgstr "FIXME Bind DN-hj�lptext h�r"
 
 #. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Kom ih�g detta l�senord"
 
@@ -509,15 +509,15 @@ msgstr "FIXME S�kv�gshj�lptext h�r"
 msgid "Create path if it doesn't exist."
 msgstr "Skapa s�kv�gen om den inte finns."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "L�gg till adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -525,22 +525,22 @@ msgstr ""
 "Markera den typ av adressbok du har och ange den relevanta informationen om "
 "den."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Namn:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME Namnhj�lptext h�r"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Beskrivningshj�lptext h�r"
 
@@ -712,9 +712,9 @@ msgstr "Fabrik f�r adressbokens namnvalsgr�nssnitt"
 #: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
 #: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Ta bort"
@@ -842,8 +842,8 @@ msgstr "_Kontakter..."
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -1323,7 +1323,7 @@ msgstr "Skicka meddelande till kontakt"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
@@ -1338,7 +1338,7 @@ msgstr "Skriv ut kuvert"
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1720,18 +1720,18 @@ msgstr "Bredd:"
 msgid "_Font..."
 msgstr "_Typsnitt..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:547
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fel vid kommunikation med kalenderserver"
 
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/calendar/calendar-conduit.c:840
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte l�sa pilotens kalenderprogramblock"
 
-#: calendar/conduits/todo/todo-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:655
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte l�sa pilotens att-g�ra-programblock"
 
@@ -1877,24 +1877,52 @@ msgstr "Kunde inte initiera gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken f�r alarmaviseringstj�nsten"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:402
+#, 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:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunde inte skapa kalendervyn. Kontrollera din ORBit- och OAF-installation."
 
 #: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:306
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Publikt"
 
 #: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -1926,58 +1954,58 @@ msgstr "�"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "H�g"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "L�g"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Genomskinlig"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Ogenomskinlig"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "P�g�r"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
 #: calendar/gui/dialogs/meeting-page.c:648
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "F�rdigt"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbruten"
@@ -2011,12 +2039,12 @@ msgstr ""
 "eller \"Ingen\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
-#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
 #: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
 #: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
 #: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
@@ -2025,7 +2053,7 @@ msgstr ""
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1086
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2035,44 +2063,44 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentv�rdet m�ste vara mellan 0 och 100"
 
-#: calendar/gui/calendar-model.c:1167
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteten m�ste vara \"H�g\", \"Normal\", \"L�g\" eller \"Odefinierad\"."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: calendar/gui/calendar-model.c:1221
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Genomskinligheten m�ste vara \"Genomskinlig\", \"Ogenomskinlig\" eller "
 "\"Ingen\"."
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "�terkommande"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1717 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
 #: calendar/gui/dialogs/meeting-page.c:630
 #: calendar/gui/dialogs/meeting-page.c:1158
 #: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1717 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
 #: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nej"
@@ -2384,7 +2412,7 @@ msgid "Fri"
 msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "fredag"
 
@@ -2393,7 +2421,7 @@ msgid "Mon"
 msgstr "m�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "m�ndag"
 
@@ -2414,7 +2442,7 @@ msgid "Sat"
 msgstr "l�r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "l�rdag"
 
@@ -2435,7 +2463,7 @@ msgid "Sun"
 msgstr "s�n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "s�ndag"
 
@@ -2452,7 +2480,7 @@ msgid "Thu"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -2477,7 +2505,7 @@ msgid "Tue"
 msgstr "tis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -2486,7 +2514,7 @@ msgid "Wed"
 msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -2561,27 +2589,27 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort n�gra �ndringar, uppdatera redigeraren?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " till "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (F�rdigt "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "F�rdigt "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Ska utf�ras "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Ska utf�ras "
 
@@ -2908,7 +2936,7 @@ msgid "Role"
 msgstr "Roll"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
@@ -2937,32 +2965,32 @@ msgstr "_Bjud in andra"
 msgid "_Other Organizer"
 msgstr "_Annan organisat�r"
 
-#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:587
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta m�te har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1108
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1116
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/dialogs/recurrence-page.c:1286
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "f�rekomster"
 
@@ -3055,7 +3083,7 @@ msgid "No one"
 msgstr "Ingen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -3088,102 +3116,106 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:840
-msgid "Edit this task"
-msgstr "Redigera denna uppgift"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_�ppna"
 
-#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:842 calendar/gui/e-calendar-table.c:852
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopiera"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Klistra in"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:845
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Markera som f�rdig"
 
-#: calendar/gui/e-calendar-table.c:846
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Ta bort denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:855
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Markera uppgifterna som f�rdiga"
 
-#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1122
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Klicka h�r f�r att l�gga till en uppgift"
 
@@ -3257,13 +3289,6 @@ msgstr "%02i minutdivisioner"
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-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:1357
@@ -3283,121 +3308,124 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nytt m�te"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nytt heldagsarrangemang"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "G� till idag"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "G� till _idag"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "G� till datum..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "�ppna"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Ta bort detta m�te"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "G�r denna f�rekomst flyttbar"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f�rekomst"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Ta bort alla f�rekomster"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Detta �r ett evenemang som kan l�ggas till i din kalender."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Detta �r en m�tesbeg�ran."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Detta �r en eller flera till�gg till ett aktuellt m�te."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Detta �r en beg�ran av den senaste evenemangsinformationen."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Detta �r ett svar p� en m�tesbeg�ran."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Detta �r en evenemangsavbokning."
 
-#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Detta meddelande kan inte f�rst�s."
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Detta �r en uppgift som kan l�ggas till i din kalender."
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Detta �r en beg�ran om en uppgift."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Detta �r en beg�ran av den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Detta �r ett svar p� en uppgiftsbeg�ran."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Detta �r en uppgiftsavbokning."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Detta �r ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Detta �r en beg�ran av ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Detta �r ett svar p� en beg�ran av ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:845
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet inneh�ller typer av beg�ran som inte st�ds."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Informationen i denna bilaga var inte giltig"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Jag kunde inte ta bort objektet fr�n din kalenderfil!\n"
 
@@ -3465,20 +3493,17 @@ msgstr "Metoden som kr�vs f�r att l�sa in \"%s\" st�ds inte"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nytt m�te..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Ta bort alla f�rekomster"
-
-#: calendar/gui/gnome-cal.c:969
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte �ppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:980
+#: calendar/gui/gnome-cal.c:1010
 #, 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"
@@ -3748,7 +3773,7 @@ msgstr "Skriv ut objekt"
 msgid "Print Setup"
 msgstr "Skrivarinst�llningar"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
@@ -5727,11 +5752,11 @@ msgstr "�ppna fil"
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2252
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2346
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa f�nster f�r meddelanderedigering."
 
@@ -6019,9 +6044,9 @@ msgid "outgoing"
 msgstr "utg�ende"
 
 #: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "L�gg till"
 
@@ -6146,124 +6171,120 @@ msgid "Expression"
 msgstr "Uttryck"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Vidarebefordra till adress"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Viktigt"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "�r"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "�r st�rre �n"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "�r mindre �n"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "�r inte"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "S�ndlista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Meddelandetext"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Meddelandehuvud"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Meddelandet mottogs"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Meddelandet skickades"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "den eller efter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "den eller innan"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "L�s"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "S�kning med regulj�rt uttryck"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Svarade till"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Po�ng"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Avs�ndare"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "St�ll in status"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "l�ter som"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "K�llkonto"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "b�rjar med"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:866
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "�mne"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "var f�re"
 
@@ -6453,32 +6474,28 @@ msgstr "Filtrera p� _mottagare"
 msgid "Filter on _Mailing List"
 msgstr "Filtrera p� s�_ndlista"
 
-#: mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "_�ppna"
-
 #: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Skicka om"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avs�ndaren"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
@@ -6486,11 +6503,11 @@ msgstr "Svara till _alla"
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mar_kera som l�st"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markera som _ol�st"
 
@@ -6510,7 +6527,7 @@ msgstr "_Flytta till mapp..."
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_�ngra borttagning"
 
@@ -7345,80 +7362,90 @@ msgstr "%d oskickade"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-format.c:608
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:657
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som k�llkod."
 
-#: mail/mail-format.c:739
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:3
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-postadress:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Fr�n"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:861 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:1283
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Inget GPG/PGP-program �r konfigurerat."
 
-#: mail/mail-format.c:1298
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:1304
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:1305
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Klicka p� ikonen f�r att dekryptera."
 
-#: mail/mail-format.c:1361
+#: mail/mail-format.c:1377
 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:1369
+#: mail/mail-format.c:1388
 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:2023
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2060
 #, 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:2039
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pekare till FTP-plats (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till ok�nd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -7476,7 +7503,7 @@ msgstr ""
 "Fel vid utf�rande av operation:\n"
 "%s"
 
-#: mail/mail-mt.c:785
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Jobbar"
 
@@ -7674,36 +7701,29 @@ msgstr "Skickar"
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Anv�ndaren avbr�t �tg�rden."
 
-#: mail/mail-tools.c:175
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunde inte skapa tempor�rt meddelandef�lt \"%s\": %s"
 
-#: mail/mail-tools.c:228
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: Inget �mne]"
-
-#: mail/mail-tools.c:243
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
 #: mail/mail-tools.c:245
-msgid "Forwarded message (no subject)"
-msgstr "Vidarebefordrat meddelande (inget �mne)"
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Vidarebefordrade meddelanden"
 
 #: mail/mail-tools.c:469
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
-"%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Vidarebefordrade meddelanden"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7853,31 +7873,32 @@ msgstr "%a %H.%M"
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 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:442
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "L�gg till en diskussionsgruppsk�lla"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Ange URL:en till den diskussionsgruppsk�lla som du vill l�gga till"
 
-#: my-evolution/e-summary-preferences.c:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "Inst�llningar f�r Mitt Evolution"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Ett fel uppstod n�r diskussionsgruppsk�llan h�mtades</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fel vid h�mtning av RDF</b>"
 
@@ -9160,14 +9181,10 @@ msgid "Weather settings"
 msgstr "V�derinst�llningar"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "Rensa sp�rare"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "amerikanska"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metriska"
 
@@ -9635,6 +9652,10 @@ msgstr "Byt namn p� genv�g"
 msgid "Rename selected shortcut to:"
 msgstr "Byt namn p� den markerade genv�gen till:"
 
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "�ppna"
+
 #: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "�ppna mappen som �r l�nkad till denna genv�g"
@@ -9849,10 +9870,10 @@ msgstr "Skicka fels�kningsinformation fr�n alla komponenter till en fil."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Klipp _ut"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopiera"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
@@ -9866,6 +9887,10 @@ msgstr "Skapa ny kontakt"
 msgid "Create new contact list"
 msgstr "Skapa ny kontaktlista"
 
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
@@ -9882,6 +9907,10 @@ msgstr "Ny kontakt"
 msgid "New list"
 msgstr "Ny lista"
 
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Klistra in"
+
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Klistra in fr�n urklipp"
@@ -9922,16 +9951,6 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "_Kontaktgrupp"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "Klistra _in"
-
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9970,7 +9989,7 @@ msgstr "Skapa ett nytt m�te"
 msgid "Create an event for the whole day"
 msgstr "Skapa en h�ndelse som varar en hel dag"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "G� till"
 
@@ -9986,10 +10005,6 @@ msgstr "G� fram�t i tiden"
 msgid "Go to _Date"
 msgstr "G� till _datum"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "G� till _idag"
-
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "G� till ett specifikt datum"
@@ -9998,6 +10013,10 @@ msgstr "G� till ett specifikt datum"
 msgid "Go to present time"
 msgstr "G� till nuvarande tid"
 
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nytt m�te"
+
 #: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "F�rhandsgranskar kalendern som ska skrivas ut"
@@ -10083,7 +10102,7 @@ msgstr "Huvudverktygsrad"
 msgid "Preview the printed item"
 msgstr "F�rhandsgranska det utskrivna objektet"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "F�rhands_granska"
 
@@ -10571,171 +10590,206 @@ msgstr "Vidarebefordra det markerade meddelandet till n�gon"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Vidarebefordra det markerade meddelandet till n�gon som en bilaga"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "L�s in _bilder"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Markera som _viktigt"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Markera som ovi_ktigt"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Markera de markerade meddelandena som l�sta"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Markera de markerade meddelandena som viktiga"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Markera de markerade meddelandena som ol�sta"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Markera de markerade meddelandena som oviktiga"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Markera de markerade meddelandena f�r borttagning"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Flytta markerade meddelanden till en annan mapp"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "N�sta"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "N�sta meddelande"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "N�sta meddelande"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Markera tr�_d"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "N�sta meddelande"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "�ppna det markerade meddelandet i ett nytt f�nster"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "�ppna det markerade meddelandet i redigeraren f�r �ters�ndning av det"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "F�rhandsgranskar meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "F�reg�ende"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "F�reg�ende meddelande"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "F�reg�ende meddelande"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "F�reg�ende meddelande"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Skriv ut meddelande..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "F�rhandsgranska..."
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svara"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "S_�k meddelande"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Spara meddelandet som en textfil"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "S�k efter text i meddelandetexten p� det visade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Visa e-post_k�llkod"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Visa fullst�ndiga _huvuden"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Visa meddelanden i normal stil"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Visa meddelande med alla e-posthuvuden"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Visa den r�a e-postk�llkoden till meddelandet"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "�ngra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuell mapp p� _s�ndlista..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "Virtuell mapp p� _avs�ndare..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "Virtuell mapp p� _mottagare..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "Virtuell mapp p� _�mnesrad..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Till�mpa filter"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter fr�n meddelande"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Vidarebefordra meddelande"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_�ppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Skicka _om meddelande"
 
@@ -11004,45 +11058,47 @@ msgid "Re_fresh Task"
 msgstr "Upp_datera uppgift"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Konfigurera kalenderns inst�llningar"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiera markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut markerad uppgift"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Ta bort markerade uppgifter"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Klistra in uppgift fr�n urklipp"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Spara uppgift som n�got annat"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "St�ll in inst�llningar f�r uppgiftsvy"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "TasksPreferences"
-msgstr "Uppgiftsvyinst�llningar..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Uppgiftsinst�llningar..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ui/evolution-tasks.xml.h:19
-msgid "_Tasks Settings..."
-msgstr "_Uppgiftsinst�llningar..."
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
@@ -11364,11 +11420,6 @@ msgstr "Definiera vyer"
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nu"
@@ -11532,6 +11583,40 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "St�ll in inst�llningar f�r uppgiftsvy"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Uppgiftsvyinst�llningar..."
+
+#~ msgid "Edit this task"
+#~ msgstr "Redigera denna uppgift"
+
+#~ msgid "Go to Today"
+#~ msgstr "G� till idag"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Ta bort alla f�rekomster"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Vidarebefordra till adress"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: Inget �mne]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Vidarebefordrat meddelande (inget �mne)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
+#~ "%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "Rensa sp�rare"
+
 #~ msgid "File not found"
 #~ msgstr "Filen hittades inte"
 
@@ -12174,12 +12259,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Delete this message"
 #~ msgstr "Ta bort detta meddelande"
 
-#~ msgid "Previous message"
-#~ msgstr "F�reg�ende meddelande"
-
-#~ msgid "Next message"
-#~ msgstr "N�sta meddelande"
-
 #~ msgid "Select everything"
 #~ msgstr "Markera alltihop"
 
diff --git a/po/tr.po b/po/tr.po
index 9bb9ca3c6d..fe68ceaa21 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-07-02 09:25+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\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,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3520
+#: 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."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "VCard dosyalar�n� Evolution'a aktar�r."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3522
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -24,7 +32,7 @@ msgstr ""
 "\n"
 "�sim: "
 
-#: addressbook/backend/ebook/e-card.c:3523
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -32,7 +40,7 @@ msgstr ""
 "\n"
 "  �nek:     "
 
-#: addressbook/backend/ebook/e-card.c:3524
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -40,7 +48,7 @@ msgstr ""
 "\n"
 "  Verilen:      "
 
-#: addressbook/backend/ebook/e-card.c:3525
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -48,7 +56,7 @@ msgstr ""
 "\n"
 "  Ek: "
 
-#: addressbook/backend/ebook/e-card.c:3526
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -56,7 +64,7 @@ msgstr ""
 "\n"
 "  Aile:     "
 
-#: addressbook/backend/ebook/e-card.c:3527
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +72,7 @@ msgstr ""
 "\n"
 "  Sonek:     "
 
-#: addressbook/backend/ebook/e-card.c:3541
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +80,7 @@ msgstr ""
 "\n"
 "Do�um G�n�: "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +88,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3554
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,7 +96,7 @@ msgstr ""
 "\n"
 "  Posta Kutusu:  "
 
-#: addressbook/backend/ebook/e-card.c:3555
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -96,7 +104,7 @@ msgstr ""
 "\n"
 "  Di�er:         "
 
-#: addressbook/backend/ebook/e-card.c:3556
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +112,7 @@ msgstr ""
 "\n"
 "  Cadde:      "
 
-#: addressbook/backend/ebook/e-card.c:3557
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +120,7 @@ msgstr ""
 "\n"
 "  �ehir:        "
 
-#: addressbook/backend/ebook/e-card.c:3558
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +128,7 @@ msgstr ""
 "\n"
 "  B�lge:      "
 
-#: addressbook/backend/ebook/e-card.c:3559
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +136,7 @@ msgstr ""
 "\n"
 "  Posta Kodu: "
 
-#: addressbook/backend/ebook/e-card.c:3560
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -136,13 +144,13 @@ msgstr ""
 "\n"
 "  �lke:     "
 
-#: addressbook/backend/ebook/e-card.c:3573
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -150,7 +158,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3588
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -158,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -166,7 +174,7 @@ msgstr ""
 "\n"
 "E-posta:\n"
 
-#: addressbook/backend/ebook/e-card.c:3615
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -174,7 +182,7 @@ msgstr ""
 "\n"
 "E-posta:"
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -182,7 +190,7 @@ msgstr ""
 "\n"
 "Postalay�c�: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -190,7 +198,7 @@ msgstr ""
 "\n"
 "Zaman Dilimi: "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -198,7 +206,7 @@ msgstr ""
 "\n"
 "Co�rafi Konum: "
 
-#: addressbook/backend/ebook/e-card.c:3652
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -206,7 +214,7 @@ msgstr ""
 "\n"
 "Meslek: "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -214,7 +222,7 @@ msgstr ""
 "\n"
 "Kurum: "
 
-#: addressbook/backend/ebook/e-card.c:3665
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -222,7 +230,7 @@ msgstr ""
 "\n"
 "  �sim:  "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -230,7 +238,7 @@ msgstr ""
 "\n"
 "  �nite:  "
 
-#: addressbook/backend/ebook/e-card.c:3667
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -238,7 +246,7 @@ msgstr ""
 "\n"
 "  �nite2: "
 
-#: addressbook/backend/ebook/e-card.c:3668
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -246,7 +254,7 @@ msgstr ""
 "\n"
 "  �nite3: "
 
-#: addressbook/backend/ebook/e-card.c:3669
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -254,7 +262,7 @@ msgstr ""
 "\n"
 "  �nite5: "
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -262,7 +270,7 @@ msgstr ""
 "\n"
 "S�n�flar: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -280,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -288,7 +296,7 @@ msgstr ""
 "\n"
 "�zel Dizi: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -296,34 +304,23 @@ msgstr ""
 "\n"
 "A��k Anahtar: "
 
-#: addressbook/backend/ebook/e-card.c:3952
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "�oklu VCard"
 
-#: addressbook/backend/ebook/e-card.c:3960
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
 msgid "VCard for %s"
 msgstr "%s i�in VCard"
 
-#: addressbook/backend/ebook/e-destination.c:338
-msgid "???"
-msgstr "???"
-
-#: 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."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "VCard dosyalar�n� Evolution'a aktar�r."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu ba�latamad�m"
@@ -337,14 +334,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook y�klenmedi\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat sunucusu ba�lat�lamad�"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombat ba�lat�lamad�"
 
@@ -353,264 +350,635 @@ msgstr "Wombat ba�lat�lamad�"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamad�"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Adres men�s� i�in Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Adres g�steren �rnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Adres defteri g�steren �rnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution adres defteri mini kart�n� g�steren denetleyici."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Adres Defteri mini kart g�r�nt�leyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Ba�lant�lar� d�zenleyen Evolution bile�eni."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Adres defteri mini kart mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Adres defteri isim g�sterim aray�z� mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Adres defteri men�s� mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution adres defteri bile�en mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "�rnek adres defteri kontrol mimarisi"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Sunucusu"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Dosya"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Bilinmeyen adres defteri t�r�"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Hi�biri (anonim kipi)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Parola"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Bilinmeyen kimlik denetim t�r�"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Temel"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Biri"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Alt A�a�"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Bilinmeyen saha t�r�"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Ba�lant� DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "Bind DN yard�m metni"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Bu parolay� hat�rla"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Makina:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "Makine yard�m metni"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "K�k DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "Root DN yard�m metni"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "Port yard�m metni"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Arama Sahas�:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Kimlik Denetimi:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Geli�mi� LDAP Se�enekleri"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Yol:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "Yol yard�m metni"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "E�er yoksa yol olu�tur."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Adres Defterini D�zenle"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Adres Defterine Ekle"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr "Sahip oldu�unuz adres defterini se�in ve gerekli bilgileri girin."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "�sim:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "�sim yard�m metni"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "A��klama:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "A��klama yard�m metni"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Ekle"
+msgid "Addressbook Sources"
+msgstr "Adres Defteri Kaynaklar�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "�sim"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Ekle"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_D�zenle"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Di�er Ba�lant�lar"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s i�in parolay� girin"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Adres defterini a�amad�m"
+
+#: addressbook/gui/component/addressbook.c:380
+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 ""
+"Bu adres defteri a��lamad�. Hatal� bir adres girilmi�,\n"
+"ya da LDAP sunucusu eri�ilemiyor olabilir."
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Evolution'�n bu s�r�m�nde LDAP deste�i bulunmuyor. \n"
+"E�er Evolution'� LDAP deste�i ile kullanmak istiyorsan�z,\n"
+"program� CVS kaynaklar�ndan alaca��n�z openLDAP deste�i\n"
+"ile kurmal�s�n�z:\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Bu adres defteri a��lamad�. Yeterli izin haklar�na sahip olup\n"
+"olmad���n�z� ve dosyan�n yerini kontrol edin."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Herhangi bir alan�n i�eri�i"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "�sim i�eri�i"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-posta i�eri�i"
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategori i�eri�i"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Dizin taray�c�s�n�n g�sterece�i URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Birincil E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "2. E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "3. E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Bir Eylem Se�in"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir ba�lant� yarat: \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, 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
+msgid "Querying Addressbook..."
+msgstr "Adres Defterini Ara�t�r�l�yor..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Ba�lant� Bilgisini D�zenle"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Ba�lant�lara Ekle"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "E-posta Adresini Birle�tir"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Aramalar� Kapat"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Aramalar� Etkinle�tir (Tehlikeli!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution adres defteri isim se�me aray�z�."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+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:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "T�m�n� Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTML Posta G�nderilsin mi?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "De�i�tirilen Ba�lant�:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "�leti Al�c�lar�"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "�simleri Se�in"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "_Dizinden isim se�in:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategori:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Ara"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Y�ld�n�m�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Meslek"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "��yeri _Faks�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Ba�lant�lar..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Kategoriler..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "�leti�im D�zenleyici"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:123
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Ayr�nt�lar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Farkl� Dosyala:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Genel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Yeni telefon t�r�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Notlar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Kurum:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefon T�rleri"
 
-#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1432
-msgid "Primary Email"
-msgstr "Birincil E-posta Adresi"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML e-postalar�n� kabul ediyor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Web adresi:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:96
-msgid "_Add"
-msgstr "_Ekle"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Sekreterinin ad�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Do�um g�n�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Meslek"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "�_irket:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Ba�lant�lar..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1215 mail/mail-config.glade.h:97
-#: ui/evolution-mail-message.xml.h:76 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_B�l�m:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Tam �sim..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Meslek tan�m�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Menejerinin ad�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Cep"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Lakap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Ofis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Uzmanl�k alan�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_E�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Bu mektupla�ma adresidir"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:658
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Ba�lant�y� Sil?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 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:1390
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Yard�mc�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1391
-#: addressbook/gui/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1392
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "2. Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1393
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "��yeri Faks�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1394
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Geri Arama"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1395
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Araba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1396
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "�irket"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1397
-#: addressbook/gui/contact-editor/e-contact-editor.c:1459
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1398
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "2. ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1399
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Ev Faks�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1400
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1401
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Cep"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1402
-#: addressbook/gui/contact-editor/e-contact-editor.c:1460
-#: mail/mail-config.glade.h:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Di�er"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1403
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Ba�ka Fakslar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1404
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "�a�r� Cihaz�"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1405
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "�lk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1406
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radyo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1407
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1408
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1433
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "2. E-posta Adresi"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "3. E-posta Adresi"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Ba�lant�y� Sil?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Ba�lant�y� H�zl� Ekle"
@@ -620,7 +988,7 @@ msgid "Edit Full"
 msgstr "T�m�n� D�zenle"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Tam �sim"
 
@@ -740,379 +1108,46 @@ msgstr "S_onek:"
 msgid "_Title:"
 msgstr "_S�fat�:"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s i�in parolay� girin"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Dosya ad�:"
 
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "Adres defterini a�amad�m"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Eyl�l"
 
-#: addressbook/gui/component/addressbook.c:380
-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"
+#: 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 ""
-"Bu adres defteri a��lamad�. Hatal� bir adres girilmi�,\n"
-"ya da LDAP sunucusu eri�ilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Evolution'�n bu s�r�m�nde LDAP deste�i bulunmuyor. \n"
-"E�er Evolution'� LDAP deste�i ile kullanmak istiyorsan�z,\n"
-"program� CVS kaynaklar�ndan alaca��n�z openLDAP deste�i\n"
-"ile kurmal�s�n�z:\n"
-
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 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:554 calendar/gui/gnome-cal.c:215
-msgid "Any field contains"
-msgstr "Herhangi bir alan�n i�eri�i"
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "�sim i�eri�i"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "E-posta i�eri�i"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategori i�eri�i"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "Dizin taray�c�s�n�n g�sterece�i URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Sunucusu"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Dosya"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Bilinmeyen adres defteri t�r�"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Hi�biri (anonim kipi)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:61
-msgid "Password"
-msgstr "Parola"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Bilinmeyen kimlik denetim t�r�"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Temel"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Biri"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Alt A�a�"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Bilinmeyen saha t�r�"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Ba�lant� DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "Bind DN yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:70
-msgid "Remember this password"
-msgstr "Bu parolay� hat�rla"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:41
-msgid "Host:"
-msgstr "Makina:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "Makine yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "K�k DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "Root DN yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "Port yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Arama Sahas�:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Kimlik Denetimi:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Geli�mi� LDAP Se�enekleri"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:62
-msgid "Path:"
-msgstr "Yol:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "Yol yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "E�er yoksa yol olu�tur."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Adres Defterini D�zenle"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Adres Defterine Ekle"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Sahip oldu�unuz adres defterini se�in ve gerekli bilgileri girin."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:51
-msgid "Name:"
-msgstr "�sim:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "�sim yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "A��klama:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "A��klama yard�m metni"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adres Defteri Kaynaklar�"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Sil"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "D�zenle"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "�sim"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Di�er Ba�lant�lar"
-
-#.
-#. * 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
-msgid "(none)"
-msgstr "(hi�biri)"
-
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Bir Eylem Se�in"
-
-#: addressbook/gui/component/e-address-popup.c:585
-msgid "Create a new contact \"%s\""
-msgstr "Yeni bir ba�lant� yarat: \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:597
-#, 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
-msgid "Querying Addressbook..."
-msgstr "Adres Defterini Ara�t�r�l�yor..."
-
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "Ba�lant� Bilgisini D�zenle"
-
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "Ba�lant�lara Ekle"
-
-#: addressbook/gui/component/e-address-popup.c:989
-msgid "Merge E-Mail Address"
-msgstr "E-posta Adresini Birle�tir"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Aramalar� Kapat"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Aramalar� Etkinle�tir (Tehlikeli!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Adres men�s� i�in Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Adres g�steren �rnek bir Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Adres defteri g�steren �rnek bir Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adres defteri mini kart�n� g�steren denetleyici."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adres Defteri mini kart g�r�nt�leyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Ba�lant�lar� d�zenleyen Evolution bile�eni."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Adres defteri mini kart mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Adres defteri isim g�sterim aray�z� mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Adres defteri men�s� mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution adres defteri bile�en mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "�rnek adres defteri kontrol mimarisi"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "T�m�n� Sil"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "HTML Posta G�nderilsin mi?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adres defteri isim se�me aray�z�."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Adres defteri isim se�im aray�z� mimarisi"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "�leti Al�c�lar�"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "�simleri Se�in"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "_Dizinden isim se�in:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategori:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "�leti�im D�zenleyici"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Ara"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "�leti�im D�zenleyici"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Ekle Gitsin"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "�ift Ba�lant� Bulundu"
 
@@ -1133,18 +1168,14 @@ msgstr ""
 "Yine de eklemek istiyor musunuz?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "De�i�tir"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "De�i�tirilen Ba�lant�:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "�ak��an Ba�lant�:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1152,8 +1183,13 @@ msgstr ""
 "De�i�tirilen ba�lant� adresinin ad� ya da e-posta adresi zaten var.\n"
 "Yine de eklemek istiyor musunuz?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "De�i�tir"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Ara"
 
@@ -1284,9 +1320,9 @@ msgstr "Ba�lant�ya ileti g�nder"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:51
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Yazd�r"
 
@@ -1295,138 +1331,213 @@ msgstr "Yazd�r"
 msgid "Print Envelope"
 msgstr "Zarf� Yazd�r"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+msgid "Error modifying card"
+msgstr "Kartlar d�zenlenirken bir hata olu�tu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Kaynaklar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "�evrimd��� �al��"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "�zin yok"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Dosya bulunamad�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "��lem desteklenmiyor"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "�ptal Edildi"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "G/� hatas�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s y�klenirken hata olu�tu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Kartlar d�zenlenirken bir hata olu�tu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Kartlar d�zenlenirken bir hata olu�tu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, 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:1086
+msgid "Error removing card"
+msgstr "Kart� silerken bir hata olu�tu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Ba�lant� eklemek buraya t�klay�n *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Farkl� Dosyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "�lk Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Sekreter Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "�� Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Geri Arama Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "�irket Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Kurum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "��yeri Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Ev Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Ara� Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "2. �� Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "2. Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Di�er Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Di�er Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Web Sayfas�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "B�l�m"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Ofis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "S�fat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Uzmanl�k alan�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Y�netici"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Lakap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "E�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Not"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Web Sayfas�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Tamamland�."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Kart� silerken bir hata olu�tu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Kartlar siliniyor..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Kartlar d�zenlenirken bir hata olu�tu"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Adres Defterine kaydet"
@@ -1474,7 +1585,8 @@ msgid "Dimensions:"
 msgstr "Boyutlar:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Yaz�tipi..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1613,37 +1725,62 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "Geni�lik:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Yaz�tipi..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Takvim sunucusuyla ileti�imde hata olu�tu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'tan takvim uygulama blo�u okunamad�"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot ToDO uygulama blo�u okunamad�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Randevu hat�rlatma tarihi"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Takvim g�steren �rnek bir Bonobo denetleyici."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Dinlenme"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution takvim �zet bile�eni."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "Tamam"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution takvimi iTip/iMip g�r�nt�leyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Takvimi d�zenleyen Evolution bile�eni."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Takvim �zet bile�en mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution takvimi bile�en mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Takvim iTip g�r�nt� kontrol� mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "�rnek Takvim kontrol� mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution takvimi bile�en mimarisi."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1653,83 +1790,88 @@ msgstr "Alarm bilgilendirme servisi"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm bilgilendirme servisi mimarisi"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, 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:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, 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:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, 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:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Randevu uyar�s�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, 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:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, 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:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, 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:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "G�rev uyar�s�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, fuzzy, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-#, fuzzy
-msgid "Notification about your journal entry"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 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:301
-msgid "No summary available."
-msgstr "�zet yok."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.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:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Kapat"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Kapat"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Toplant�y� d�zenle"
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Dinlenme"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Dinlenme zaman� (dakika)"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Toplant�y� d�zenle"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "�zet yok."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Randevu hat�rlatma tarihi"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Dinlenme"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Tamam"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1750,125 +1892,149 @@ msgstr "Gnome-vfs ba�lat�lam�yor"
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi olu�turamad�m"
 
-#: calendar/gui/calendar-commands.c:275
-msgid "File not found"
-msgstr "Dosya bulunamad�"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%d %B %A"
 
-#: calendar/gui/calendar-commands.c:299
-msgid "Open calendar"
-msgstr "Takvimi a�"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:341
-msgid "Save calendar"
-msgstr "Takvimi kaydet"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%d %b %a"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:523
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 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:361 calendar/gui/calendar-model.c:951
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Genel"
 
-#: calendar/gui/calendar-model.c:364 calendar/gui/calendar-model.c:953
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "�zel"
 
-#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:955
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:370 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: calendar/gui/calendar-model.c:458
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:458
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:441 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Y�ksek"
 
-#: calendar/gui/calendar-model.c:500 calendar/gui/calendar-model.c:1121
-#: calendar/gui/calendar-model.c:1644
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:442 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:502 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:443 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "D���k"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1175
-#: calendar/gui/e-calendar-table.c:495
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "�effaf"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1177
-#: calendar/gui/e-calendar-table.c:494
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:690 calendar/gui/calendar-model.c:1229
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:515
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Ba�lamad�"
 
-#: calendar/gui/calendar-model.c:693 calendar/gui/calendar-model.c:1231
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:516
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "��lemde"
 
-#: calendar/gui/calendar-model.c:696 calendar/gui/calendar-model.c:1233
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:517
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Tamamland�"
 
-#: calendar/gui/calendar-model.c:699 calendar/gui/calendar-model.c:1235
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:518 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "�ptal Edildi"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:847 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:850 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1879,23 +2045,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:935
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "S�n�fland�rma 'Genel', '�zel', 'Gizli', ya da 'Hi�biri' olmal�d�r."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:949 calendar/gui/calendar-model.c:1173
-#: calendar/gui/calendar-model.c:1227 calendar/gui/e-calendar-table.c:418
-#: calendar/gui/e-calendar-table.c:493 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:125 mail/mail-accounts.c:176
-#: mail/mail-config.glade.h:54 shell/e-shell-view.c:1398
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1905,150 +2075,251 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Y�zde de�eri 0 ile 100 aras�nda bulunmal�d�r."
 
-#: calendar/gui/calendar-model.c:1104
+#: calendar/gui/calendar-model.c:1168
 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."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Tan�ms�z"
 
-#: calendar/gui/calendar-model.c:1158
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "�effafl�k de�eri '�effaf', 'Opak' ya da 'Hi�biri' olmal�d�r."
 
-#: calendar/gui/calendar-model.c:1646
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1648
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "G�revlendirildi"
 
-#: calendar/gui/calendar-model.c:1654
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1654
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Hay�r"
 
+#: calendar/gui/calendar-view-factory.c:149 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
+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
+msgid "Week View"
+msgstr "Hafta G�r�n�m�"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Ay G�r�n�m�"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "Takvimin g�sterecek oldu�u URI"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Geli�mi� LDAP Se�enekleri"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "�leti Al�c�lar�"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "%s'ten E-posta"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "�leti _G�r�n�m�"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Bir ses �al"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Bir program �al��t�r"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "g�n"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "dakika"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
 msgid "%d days"
 msgstr "%d g�n"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 g�n"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
 msgid "%d weeks"
 msgstr "%d hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
 msgid "%d minutes"
 msgstr "%d dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
+#, c-format
 msgid "%d seconds"
 msgstr "%d saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Bir ses �al"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "Bir pencere g�ster"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Sonraki iletiyi g�ster"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Bir e-posta g�nder"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Bir program �al��t�r"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " randevunun ba�lang�c�ndan �nce"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " randevunun ba�lang�c�ndan sonra"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " randevunun bitiminden �nce"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " randevunun bitiminden sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Temel"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Tarih/Zaman:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Hat�rlat�c�lar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:36
-msgid "Settings..."
-msgstr "Ayarlar..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�zet:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Se�enekler"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2071,7 +2342,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:99
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -2112,7 +2383,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Alarm penceresi g�r�nd���nde biple."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Takvim"
 
@@ -2145,7 +2416,7 @@ msgid "Defaults"
 msgstr "�ntan�ml�lar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "G�sterim"
 
@@ -2162,7 +2433,7 @@ msgid "Fri"
 msgstr "Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Cuma"
 
@@ -2171,7 +2442,7 @@ msgid "Mon"
 msgstr "Pzt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -2192,7 +2463,7 @@ msgid "Sat"
 msgstr "Cmt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -2213,7 +2484,7 @@ msgid "Sun"
 msgstr "Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -2230,7 +2501,7 @@ msgid "Thu"
 msgstr "Per"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Per�embe"
 
@@ -2255,7 +2526,7 @@ msgid "Tue"
 msgstr "Sal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Sal�"
 
@@ -2264,7 +2535,7 @@ msgid "Wed"
 msgstr "�ar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "�ar�amba"
 
@@ -2276,6 +2547,144 @@ msgstr "�al��ma Haftas�"
 msgid "minutes before they occur."
 msgstr "dakika �nce (olu�madan)."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, 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
+#, 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
+#, 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
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
+msgid "This task has been deleted."
+msgstr "Bu bir toplant� iste�idir."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+#, fuzzy
+msgid "This task has been changed."
+msgstr "Bu bir olay iptalidir."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr " (Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr "Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr "Tarihe g�re "
+
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "Toplant�y� d�zenle"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "Randevular"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "G�revler"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:474
+#, fuzzy
+msgid "No summary"
+msgstr "�leti �zeti"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Dosya �zerine yaz�ls�n m�?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ayn� isimde bir dosya zaten var\n"
+"�zerine yaz�ls�n m�?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Farkl� Kaydet..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2304,31 +2713,58 @@ 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:120
+#, 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:125
+#, 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:130
+#, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ger�ekten %s g�nl�k girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Bir dosya se�in"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "B�l�mler:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zaman Dilimi: "
+
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Hat�rlat�c�"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "Toplant�"
 
@@ -2338,7 +2774,7 @@ msgstr "_T�m g�n olaylar�"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:245
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "S�n�fland�rma"
 
@@ -2367,11 +2803,6 @@ msgstr "�_zet:"
 msgid "_Confidential"
 msgstr "_Gizli"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Ba�lant�lar..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "B_iti� tarihi:"
@@ -2380,38 +2811,274 @@ msgstr "B_iti� tarihi:"
 msgid "_Start time:"
 msgstr "B_a�lang�� tarihi:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grup ad�:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Ka��t kayna��:"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Araba"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "�stenen Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Se�imlik Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Bir Eylem Se�in"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Silinen"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Giri�imli"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Silinen"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "��lemde"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Ara� Telefonu"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "�stenen Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Se�imlik Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "G�nderildi"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Sil..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "T�m Kat�l�mc�lar"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Tamamlanma Tarihi"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Silinen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "G�revi Da��t"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Y�netici"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Eyl�l"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "G�revler"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Durum"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "T�r"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Kurum:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Kurum:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Ba�kalar�n� Davet Et..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Kurum:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%d %b %a %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Bu randevuyu Evolution d�zenleyemiyor."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "tarih"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "g�n"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "tekrarlar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "�zel tekrar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Her"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "�stisnalar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "De�i�tir"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Tekrarlama yok"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "�nizleme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Tekrarlama Kural�"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Basit tekrar"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "De�i�tir"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "i�in"
@@ -2436,48 +3103,47 @@ msgstr "hafta"
 msgid "year(s)"
 msgstr "y�l"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-msgid "%a %b %d %Y"
-msgstr "%d %b %a %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Bu randevuyu Evolution d�zenleyemiyor."
-
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
-msgstr "tarih"
-
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "g�n"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "tekrarlar"
-
 #: 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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Tamamlama Tarihi:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "G�revi Da��t"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "G�revi Da��t"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Yok"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:118
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "G�rev"
 
@@ -2506,329 +3172,317 @@ msgstr "�_ncelik:"
 msgid "_Status:"
 msgstr "_Durum:"
 
-#: calendar/gui/e-calendar-table.c:244
-msgid "Categories"
-msgstr "Kategoriler"
-
-#: calendar/gui/e-calendar-table.c:246
-msgid "Completion Date"
-msgstr "Tamamlanma Tarihi"
-
-#: calendar/gui/e-calendar-table.c:247
-msgid "End Date"
-msgstr "Biti� Tarihi"
-
-#: calendar/gui/e-calendar-table.c:248
-msgid "Start Date"
-msgstr "Ba�lang�� Tarihi"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Due Date"
-msgstr "Tarihe g�re:"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "Geographical Position"
-msgstr "Co�rafi Konum"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Percent complete"
-msgstr "Biten y�zde"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Priority"
-msgstr "�ncelik"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Summary"
-msgstr "�zet"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Transparency"
-msgstr "�effafl�k"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Alarms"
-msgstr "Uyar�lar"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Click here to add a task"
-msgstr "G�rev eklemek buraya t�klay�n"
-
-#: calendar/gui/e-calendar-table.c:463
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:464
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:466
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:467
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:950
-msgid "Edit this task"
-msgstr "Bu g�revi d�zenle"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_A�"
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-calendar-table.c:961
-#: calendar/gui/e-day-view.c:3268 calendar/gui/e-week-view.c:3100
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Kes"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:952 calendar/gui/e-calendar-table.c:962
-#: calendar/gui/e-day-view.c:3270 calendar/gui/e-week-view.c:3102
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopyala"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c:953 calendar/gui/e-calendar-table.c:963
-#: calendar/gui/e-day-view.c:3243 calendar/gui/e-day-view.c:3272
-#: calendar/gui/e-week-view.c:3076 calendar/gui/e-week-view.c:3104
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Yap��t�r"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Yap��t�r"
 
-#: calendar/gui/e-calendar-table.c:955
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Bitmi� olarak i�aretle"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Bu g�revi sil"
 
-#: calendar/gui/e-calendar-table.c:965
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "G�revleri bitmi� olarak i�aretle"
 
-#: calendar/gui/e-calendar-table.c:966 ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Se�ilen g�revleri sil"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:306
-#: calendar/gui/print.c:785
-msgid "am"
-msgstr "��"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "G�rev eklemek buraya t�klay�n"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:309
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "�s"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "_Biten %:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Uyar�lar"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Tamamland�"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Tamamlanma Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Tarihe g�re:"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Biti� Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Co�rafi Konum"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "�ncelik"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Ba�lang�� Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "�zet"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "G�rev Listesi"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "�effafl�k"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1325
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 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/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1339
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1352
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3248 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "��"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "�s"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Yeni Randevu"
 
-#: calendar/gui/e-day-view.c:3250 calendar/gui/e-week-view.c:3083
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Y_eni T�m G�n Olay�"
 
-#: calendar/gui/e-day-view.c:3255 calendar/gui/e-week-view.c:3088
-msgid "Go to Today"
-msgstr "Bug�ne Git"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "_Bug�ne Git"
 
-#: calendar/gui/e-day-view.c:3257 calendar/gui/e-week-view.c:3090
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Tarihe Git..."
 
-#: calendar/gui/e-day-view.c:3264 calendar/gui/e-week-view.c:3096
-#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "A�"
-
-#: calendar/gui/e-day-view.c:3266 calendar/gui/e-week-view.c:3098
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Bu Randevuyu Sil"
 
-#: calendar/gui/e-day-view.c:3281 calendar/gui/e-week-view.c:3118
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Bu Olu�umu Ta��nabilir Yap"
 
-#: calendar/gui/e-day-view.c:3283 calendar/gui/e-week-view.c:3120
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Bu Olu�umu Sil"
 
-#: calendar/gui/e-day-view.c:3285
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "T�m Olu�umlar� Sil"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dakika b�lmeleri"
-
-#: calendar/gui/e-itip-control.c:544 calendar/gui/print.c:2237
-msgid " to "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:548 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr " (Tamamlanan "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "Tamamlanan "
-
-#: calendar/gui/e-itip-control.c:555 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Tarihe g�re "
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Bu takvime eklenebilen bir olayd�r."
 
-#: calendar/gui/e-itip-control.c:614
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Bu bir toplant� iste�idir."
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Bu �imdiki toplant�ya bir ya da bir ka� eklemedir."
 
-#: calendar/gui/e-itip-control.c:620
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Bu, son olay bilgisi i�in bir istektir."
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Bu, bir toplant� iste�ine cevapt�r."
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Bu bir olay iptalidir."
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:668
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Bu ileti anla��l�r de�il."
 
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Bu, takvime eklenebilen bir g�revdir."
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Bu bir g�rev iste�idir."
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Bu, son g�rev bilgisi i�in bir istektir."
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Bu bir g�rev iste�ine cevapt�r."
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Bu bir g�rev iptalidir."
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:834
 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:735
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Takvim dosyan� g�ncelleyemedim!\n"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Bu ��e takvim dosyas�ndan silinemedi!\n"
 
@@ -2857,10 +3511,6 @@ msgstr "Takvim Y�kleniyor"
 msgid "Loading calendar..."
 msgstr "Takvim y�kleniyor..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Kurum:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Sunucu Mesaj�:"
@@ -2873,98 +3523,48 @@ msgstr "biti�-tarihi"
 msgid "date-start"
 msgstr "ba�lang��-tarihi"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "T�m�"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "%s i�indeki g�revler y�klenemedi."
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:415
 #, 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:3081 calendar/gui/e-week-view.c:3109
-msgid "New Appointment..."
-msgstr "Yeni Randevu..."
-
-#: calendar/gui/e-week-view.c:3122
-msgid "Delete All Occurrences"
-msgstr "T�m Olu�umlar� Sil"
-
 #. 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/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:216
-msgid "Summary contains"
-msgstr "�zet i�eri�i"
-
-#: calendar/gui/gnome-cal.c:217
-msgid "Description contains"
-msgstr "A��klama i�eri�i"
-
-#: calendar/gui/gnome-cal.c:218
-msgid "Comment contains"
-msgstr "Yorum i�eri�i"
-
-#: calendar/gui/gnome-cal.c:219
-msgid "Has category"
-msgstr "Kategori"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Yeni Randevu..."
 
-#: calendar/gui/gnome-cal.c:1015
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini a��lamad�."
 
-#: calendar/gui/gnome-cal.c:1026
+#: calendar/gui/gnome-cal.c:1010
 #, 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_Evolution_Calendar.oaf.in.h:1
-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:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution takvim �zet bile�eni."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution takvimi iTip/iMip g�r�nt�leyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Takvimi d�zenleyen Evolution bile�eni."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Takvim �zet bile�en mimarisi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution takvimi bile�en mimarisi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Takvim iTip g�r�nt� kontrol� mimarisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "�rnek Takvim kontrol� mimarisi"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -2986,245 +3586,255 @@ msgid "Go To Date"
 msgstr "Tarihe Git"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Bug�ne Git"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Ocak"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Temmuz"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Haziran"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "May�s"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Kas�m"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Ekim"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Eyl�l"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Bug�ne Git"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "39."
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Pz"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Pt"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Sa"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "�a"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Pe"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Cu"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Ct"
 
-#: calendar/gui/print.c:1847 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "G�revler"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Ge�erli g�n (%d %b %a %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%d %b %a"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%d %a %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Ge�erli hafta (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Ge�erli ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ge�erli y�l (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Takvimi Yazd�r"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1779 my-evolution/e-summary.c:449
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "�nizlemeyi Yazd�r"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "��eyi Yazd�r"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Yazd�rma Ayarlar�"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "G�sterilecek g�revler dizininin URI'si"
 
@@ -3266,96 +3876,6 @@ msgstr "`%s' y�klemek i�in gereken y�ntem desteklemiyor."
 msgid "SMTWTFS"
 msgstr "PPS�PCCP"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now hi� arg�man istemiyor"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time 1 arg�man istiyor"
-
-#: calendar/pcs/query.c:247
-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:255
-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:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day 2 arg�man istiyor"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-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:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin bir arg�man istiyor"
-
-#: calendar/pcs/query.c:323
-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:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end bir arg�man istiyor"
-
-#: calendar/pcs/query.c:353
-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:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype hi� arg�man istemiyor"
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "ocrur-in-time-range? iki arg�man istiyor"
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr "contains? iki arg�man istiyor"
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? birinci arg�man� dizgi �eklinde istiyor"
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? ikinci arg�man� dizgi �eklinde istiyor"
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? t�m arg�manlar� dizgi �eklinde istiyor"
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Bu �ifreleme ile imza desteklenmiyor"
@@ -3376,64 +3896,80 @@ 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
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 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:537 camel/camel-filter-driver.c:546
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Dizinler e�zamanl� hale getiriliyor"
 
-#: camel/camel-filter-driver.c:646
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Spool dizini a��lamad�"
 
-#: camel/camel-filter-driver.c:655
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Spool dizini i�lenemedi"
 
-#: camel/camel-filter-driver.c:669
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi al�n�yor"
 
-#: camel/camel-filter-driver.c:673 camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:674
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "�leti a��lamad�"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:805
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Dizin e�zamanl� hale getiriliyor"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:810
-msgid "Complete"
-msgstr "Tamamland�"
-
-#: camel/camel-filter-driver.c:764
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti al�n�yor"
 
-#: camel/camel-filter-driver.c:769 camel/camel-filter-driver.c:787
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayr��t�r�rken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini �al��t�r�rken hata oldu: %s"
 
-#: camel/camel-filter-search.c:437 camel/camel-filter-search.c:444
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramas�n� �al��t�r�rken hata oldu: %s"
@@ -3469,6 +4005,26 @@ msgstr "Bilinmeyen ba�l�k �zerinde arama yap�l�yor: %s"
 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
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yarat�lamad�: %s"
+
+#: camel/camel-lock-client.c:123
+#, 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
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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
 #, c-format
@@ -3492,108 +4048,108 @@ msgstr "fcntl(2) kullan�l�rken kilitleme hatas�: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) kullan�l�rken kilitleme hatas�: %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "E-posta dosyas� %s denetlenemedi: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "E-posta dosyas� %s a��lamad�: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, 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:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "%s posta dosyas�n� okurken hata olu�tu"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Ge�ici mektup dosyas�na yazarken hata: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, 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:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yarat�lamad�: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�atallama yap�lamad�: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program�nda hata: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Bilinmeyen hata)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "%s posta dosyas�n� okurken hata olu�tu"
+
+#: camel/camel-movemail.c:274
+#, 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
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ge�ici mektup dosyas�na yazarken hata: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "%s parolas�n� %s i�in parolay� girin"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "%s parolas�n� girin"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "�mzalanacak metin yok."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Parola verilmedi"
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile ba�lant� kurulamad�: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Do�rulanacak metin yok."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "%s ge�ici dosyas� yarat�lamad�"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "�ifrelenecek metin yok."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Al�c� belirtilmedi"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "A��lacak �ifre metni yok."
 
@@ -3627,7 +4183,7 @@ msgid "Connection cancelled"
 msgstr "Ba�lant� iptal edildi"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine ba�lant� kurulamad� (%d): %s"
@@ -3636,13 +4192,13 @@ msgstr "%s adresine ba�lant� kurulamad� (%d): %s"
 msgid "(unknown host)"
 msgstr "(bilinmeyen makine)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "��lem iptal edildi"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Sunucu beklenmedik bir �ekilde ba�lant�y� kesti"
 
@@ -3748,7 +4304,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatal� kimlik s�nama yan�t�."
 
@@ -3817,7 +4373,7 @@ msgstr "di�er bir dizin listesinden al�nan iletileri okumak i�in"
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokol� i�in al�c� yok"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3827,6 +4383,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-smime-context.c:173
+#, c-format
 msgid "Please enter your password for %s"
 msgstr "%s i�in parolan�z� girin"
 
@@ -3835,15 +4392,18 @@ msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
 #: camel/camel-smime-context.c:209
+#, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "\"%s\" i�in imza sertifikas� bulunmuyor."
 
 #: camel/camel-smime-context.c:249
+#, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "\"%s\" i�in �ifreleme sertifikas� bulunmuyor."
 
 #: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
 #: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "\"%s\" i�in sertifika bulunamad�."
 
@@ -3859,33 +4419,17 @@ msgstr "Mesaj�n a��lmas�nda hata."
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1029 mail/mail-ops.c:1036
-#: mail/mail-ops.c:1054 mail/mail-ops.c:1055
-msgid "Trash"
-msgstr "��p"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-posta: %s\n"
-"Ad�: %s\n"
-"Kurum Birimi: %s\n"
-"Kurum: %s\n"
-"Yer: %s\n"
-"B�lge: %s\n"
-"�ehir: %s"
+"G�nderen: %s\n"
+"Konu: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3900,26 +4444,36 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"G�nderen: %s\n"
-"Konu: %s"
+"E-posta: %s\n"
+"Ad�: %s\n"
+"Kurum Birimi: %s\n"
+"Kurum: %s\n"
+"Yer: %s\n"
+"B�lge: %s\n"
+"�ehir: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL a��lamad�: %s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Bu isimle bir ileti yok: %s"
@@ -3928,67 +4482,75 @@ msgstr "Bu isimle bir ileti yok: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Bu ��p dizininden iletileri kopyalayamazs�n�z."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-msgid "Could not open cache directory: %s"
-msgstr "�nbellek dizini yarat�lamad�: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komutu ba�ar�s�z oldu: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Sunucu cevab� �ok erken bitti."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP sunucu cevab� %s bilgisini i�ermiyor"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 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:192
 #, 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:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s i�in �zet bilgisi y�klenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:270
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden olu�turuldu."
 
-#: camel/providers/imap/camel-imap-folder.c:425
-msgid "Scanning IMAP folder"
-msgstr "IMAP dizini taran�yor"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "�letiler kaydediliyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1463
-#: camel/providers/imap/camel-imap-folder.c:1716
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Bu ileti kullan�labilir de�il"
 
-#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1749
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "�letiler kaydediliyor"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevab�nda ileti g�vdesi bulunamad�"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "�nbellek dizini yarat�lamad�: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
@@ -3996,7 +4558,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:643
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Dizinler"
 
@@ -4030,28 +4592,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:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, 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:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik s�nama y�ntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, 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:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4062,11 +4624,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:335
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH bi�imli e-posta dizinleri"
@@ -4100,6 +4666,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "�letileri Unix spool dizinleri halinde saklamak i�in"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s saklama dizininde hata"
@@ -4139,7 +4706,8 @@ msgstr "`%s' dizin �zet dosyas� silinemedi: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' dizin indeks dosyas� silinemedi: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�leti �zete eklenemedi: bilinmeyen neden"
 
@@ -4155,6 +4723,7 @@ msgstr "%s dizinine ileti eklenemedi: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4166,6 +4735,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "�leti bulunmuyor"
 
@@ -4174,7 +4744,7 @@ msgstr "�leti bulunmuyor"
 msgid "Invalid message contents"
 msgstr "Ge�ersiz ileti i�eri�i"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4184,14 +4754,14 @@ msgstr ""
 "Dizin a��lamad�: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "%s dizini bulunamad�."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4201,37 +4771,41 @@ msgstr ""
 "'%s dizini yarat�lamad�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' bir maildir dizini."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "maildir dizini de�il"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "'%s dizini taranamad�: %s"
 
 #: 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 "Maildir dizini a��lamad�: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, 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:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "%s posta kutusu a��lamad�: %s\n"
@@ -4244,6 +4818,9 @@ msgstr "�leti mbox dosyas�na eklenemedi (%s): %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4253,10 +4830,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dizin onar�lamayacak �ekilde bozulmu�."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�letiler d�zenlenemiyor: �leti kutusu bozulmu� olabilir."
 
@@ -4302,36 +4881,45 @@ 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-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Dizin �zeti ��kart�l�yor"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Dizin a��lamad�: %s: %ld konumundan itibaren �zet ��kart�l�yor: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Dizin �zeti ��kart�lamad�: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1613
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Dizin e�zamanl� hale getiriliyor"
 
 #: 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-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "�zet i�in dizin a��lamad�: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ge�ici posta kutusu a��lamad�: %s"
@@ -4340,21 +4928,28 @@ msgstr "Ge�ici posta kutusu a��lamad�: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "�zet ve dizin uyu�mazl���"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ge�ici posta kutusuna yazma hatas�: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, 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:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kaynak dizin %s a��lamad�: %s"
@@ -4369,7 +4964,9 @@ msgstr "ge�ici dizin kapat�lamad�: %s"
 msgid "Could not rename folder: %s"
 msgstr "Dizinin ad� de�i�tirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
@@ -4385,42 +4982,97 @@ msgid "`%s' is not a directory."
 msgstr "`%s' bir dizin de�il."
 
 #: camel/providers/local/camel-mh-summary.c:218
+#, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH dizin yolu a��lamad�: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, 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:132
+#, 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:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "%s dizini bulunamad�."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Yerel disklerde gelen dizini bulunmas�n"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Yerel mektup dosyas� %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, 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:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "'%s dizini taranamad�: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, 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:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Kullan�c� ad� sunucu taraf�ndan reddedildi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Sunucuya kullan�c� ad� g�nderilemedi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Sunucu kullan�c� ad� ve parolas�n� reddetti"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "%s iletisi bulunamad�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Sunucudan grup listesi al�namad�."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, 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:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s i�in grup liste dosyas� kaydedilemedi: %s"
@@ -4433,17 +5085,17 @@ msgstr "USENET haber grubu"
 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:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, 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:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s �zerinden USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4451,8 +5103,8 @@ msgstr ""
 "Bu se�enek NNTP sunucusuna a��k metin parola �zerinden kimlik denetimi "
 "yapt�r�r."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, 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"
@@ -4503,7 +5155,7 @@ msgstr "�letileri sunucuda b�rak"
 msgid "Delete after %s day(s)"
 msgstr "%s g�nden sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4592,7 +5244,7 @@ msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4644,7 +5296,7 @@ msgstr "sendmail"
 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:72
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4652,122 +5304,122 @@ msgstr "SMTP"
 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:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "�mla hatas�, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da arg�manlarda imla hatas�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Komut hen�z tan�nm�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi hen�z tan�nm�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Sistem durumu, ya da sistem yard�m yan�t�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Yard�m mesaj�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servis haz�r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servis ileti�im kanal�n� kapat�yor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 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:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "�stenen ileti i�lemi tamamland�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 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:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "�stenen ileti eylemi yap�lmad�: posta kutusu bulunamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "�stenen eylem yap�lmad�: posta kutusu bulunamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 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:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 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:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "�stenen eylem yap�lmad�: disk alan� yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "�stenen eylem iptal edildi: disk alan� yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 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:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "�leti�im kurulamad�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Parola iletimi gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik s�nama y�ntemi �ok zay�f"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 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:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Ge�ici kimlik denetim hatas�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Giri� hatas�: %s: �nemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, 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:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, 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:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4778,113 +5430,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s �zerinden STMP ileti g�nderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 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:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "�leti g�nderilemiyor: g�nderen adresi ge�ersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "�leti g�nderiliyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Toplant�"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatas�: %s: ileti g�nderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yarat�lamad�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Kimlik Denetimi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, 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:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH iste�i ba�ar�s�z."
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatal� kimlik s�nama yan�t�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, 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:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, 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:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, 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:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, 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:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, 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:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, 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:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, 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:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, 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:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, 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:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cevap hatas�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, 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:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT cevap hatas�: %s: �nemsiz"
@@ -4914,7 +5580,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:126
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "ek"
 
@@ -4943,10 +5609,70 @@ msgid "MIME type:"
 msgstr "MIME t�r�:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik g�sterimini �ner"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Adres defteri i�in buraya t�klay�n"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "G�nderen:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Cevapla:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Konu:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "Al�c�:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "�letinin g�nderildi�i ki�iler"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Bilgi:"
+
+#: composer/e-msg-composer-hdrs.c:395
+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:398
+msgid "Bcc:"
+msgstr "Gizli:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"�letinin karbon kopyalar�n�n g�nderilece�i adresi girin. Ancak buraya "
+"girilecek ki�iler g�nderilenler listesinde g�r�nmeyecektir."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir dosya ekle"
+
+#: composer/e-msg-composer.c:670
+#, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
@@ -4954,28 +5680,39 @@ msgstr ""
 "%s dosyas� a��lamad�:\n"
 "%s"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:683
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
-msgstr "%s dosyas�n� y�klerken hata oldu:\n"
+msgstr ""
+"%s dosyas�n� y�klerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:854
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Farkl� kaydet..."
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Uyar�"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyas�n� kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:885
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyas�n� y�klerken hata oldu"
 
-#: composer/e-msg-composer.c:957
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4983,12 +5720,53 @@ msgstr ""
 "Bu hesap i�in taslak dizini a��lamad�.\n"
 "�ntan�ml� taslak dizinini kullanmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1023 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "%s dosyas�n� kaydederken hata oldu"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "%s POP sunucusundan iletileri alamad�m: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"��k�� dosyas� yarat�lamad�: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"��k�� dosyas� yarat�lamad�: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"�letilerin kayd�nda hata: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution, Pine e-posta dosyalar� buldu.\n"
+"Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4997,75 +5775,27 @@ msgstr ""
 "Bu ileti g�nderilmedi.\n"
 "De�i�iklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Dosyay� a�"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Dosya _Ekle"
 
-#: composer/e-msg-composer.c:1539 composer/e-msg-composer.c:1928
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2022
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Mektup g�nderme penceresi a��lamad�."
 
-#: composer/e-msg-composer-hdrs.c:325
-msgid "Click here for the address book"
-msgstr "Adres defteri i�in buraya t�klay�n"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "G�nderen:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Cevapla:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Konu:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "Al�c�:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
-msgstr "�letinin g�nderildi�i ki�iler"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Bilgi:"
-
-#: composer/e-msg-composer-hdrs.c:392
-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:395
-msgid "Bcc:"
-msgstr "Gizli:"
-
-#: composer/e-msg-composer-hdrs.c:396
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"�letinin karbon kopyalar�n�n g�nderilece�i adresi girin. Ancak buraya "
-"girilecek ki�iler g�nderilenler listesinde g�r�nmeyecektir."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5091,40 +5821,56 @@ msgid "calendar information"
 msgstr "takvim bilgisi"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 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:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 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:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%d %b %Y %a"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5132,77 +5878,65 @@ msgstr "%d %b %Y %a"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %a %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "y�l"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "y�l"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "ay"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "ay"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "hafta"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "hafta"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "g�n"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "saat"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "saat"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "dakika"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "dakika"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "saniye"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "saniye"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Bir tarih se�meyi unuttunuz."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hatal� tarih giri�i yapt�n�z."
 
-#: filter/filter-datespec.c:276
+#: 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"
@@ -5212,7 +5946,7 @@ msgstr ""
 "ya da vfolder'�n a��ld��� tarih ile\n"
 "kar��la�t�r�lacakt�r."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5220,7 +5954,7 @@ msgstr ""
 "�letinin tarihi burada belirtti�iniz\n"
 "tarih ile kar��la�t�r�lacakt�r."
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5231,28 +5965,36 @@ msgstr ""
 "�rnek olarak \"bir hafta �nce\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "�imdiki zaman"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "belirtti�iniz zaman"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "�imdiki zamana g�receli bir zaman"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Kar��la�t�r"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "�imdi"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<bir tarih se�mek i�in t�klay�n�z>"
 
@@ -5277,8 +6019,8 @@ msgstr ""
 "Bir dizin se�meyi unuttunuz.\n"
 "L�tfen geriye gidip ge�erli bir dizin se�in."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Dizini Se�in"
 
@@ -5290,46 +6032,6 @@ msgstr "Dizin URI girin"
 msgid "<click here to select a folder>"
 msgstr "<bir dizin se�mek i�in t�klay�n>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filtreleri D�zenle"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "VFolder D�zenle"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gelen"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Giden"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Sanal Dizinler"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "sadece belirtilen dizinler"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vFolder Kaynaklar�"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "t�m etkin uzak dizinlerle birlikte"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "t�m yerel ve etkin uzak dizinlerle birlikte"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "t�m yerel dizinlerle birlikte"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5351,36 +6053,88 @@ msgstr "Kural ad�:"
 msgid "Untitled"
 msgstr "�simsiz"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "E�er"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Eylemleri i�let"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "t�m kriterler sa�lan�rsa"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter sa�lan�rsa"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "S�n�f ekle"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "giden"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Ekle"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "D�zenle"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filtreleri D�zenle"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VFolder D�zenle"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Gelen"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Giden"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Sanal Dizinler"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "sadece belirtilen dizinler"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vFolder Kaynaklar�"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "t�m etkin uzak dizinlerle birlikte"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "t�m yerel ve etkin uzak dizinlerle birlikte"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "t�m yerel dizinlerle birlikte"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Renk Belirt"
 
 #: filter/libfilter-i18n.h:4
@@ -5456,90 +6210,91 @@ msgid "Expression"
 msgstr "Deyim"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Adrese Y�nlendir"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "�nemli"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "b�y�k"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "k���k"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "de�il"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "�leti G�vdesi"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "�leti Ba�l���"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "�leti al�nd�"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "�leti g�nderildi"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Dizine Ta��"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "birlikte ya da sonra"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "birlikte ya da �nce"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Oku"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Al�c�lar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "D�zg�n Deyim E�le�imi"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1047
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "G�nderen"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Durum belirt"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Boyut"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "benzer"
@@ -5556,15 +6311,11 @@ msgstr "�zel ba�l�k"
 msgid "starts with"
 msgstr "ba�layan"
 
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Durum"
-
 #: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "��lemeyi Durdur"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Konu"
@@ -5593,29 +6344,23 @@ msgstr "G�rev D�zenle"
 msgid "Score Rules"
 msgstr "Puan Kurallar�"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Aktar"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "�leti"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm Takma �simleri"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Tekrar sorma"
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5623,15 +6368,15 @@ msgstr ""
 "Evolution, Elm ileti dosyalar� buldu.\n"
 "Bunlar� Evolution'a aktarmak ister misiniz?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm iletisi"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adres Defteri"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5639,19 +6384,11 @@ msgstr ""
 "Evolution, GnomeCard dosyalar� buldu.\n"
 "Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1691
-msgid "Filters"
-msgstr "Filtreler"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "Adres Defterleri"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5659,7 +6396,7 @@ msgstr ""
 "Evolution, Netscape e-posta dosyalar� buldu.\n"
 "Bunlar�n Evolution'a aktar�lmas�n� istiyor musunuz?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5667,182 +6404,207 @@ 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
 msgid "Pine mail"
 msgstr "Pine iletisi"
 
-#: mail/component-factory.c:651
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "E-posta alma va g�nderme i�in Evolution bile�eni"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution e-posta program�."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution e-posta �zet bile�eni."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution e-posta dizin g�r�nt�leme bile�eni."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution e-posta dizin bile�eni"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution e-posta program� mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution e-posta bile�en mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "E-posta �zet bile�en mimarisi"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "�leti yap�land�rma aray�z�"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "�_zellikler..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Bu dizinin �zelliklerini de�i�tir"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'�n posta program� ba�lat�lamad�."
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Depo kabu�a kay�t ettirilemedi"
 
-#: mail/folder-browser.c:808
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" �zellikleri"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "�zellikler"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Ge�ici dizin yarat�lamad�: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Kayd� vFolder olarak kaydet"
 
-#: mail/folder-browser.c:1151
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "_Konuya G�re VFolder"
 
-#: mail/folder-browser.c:1154
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "_G�nderene G�re VFolder"
 
-#: mail/folder-browser.c:1157
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "_Al�c�lara G�re VFolder"
 
-#: mail/folder-browser.c:1160
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi �zerinde VFolder"
 
-#: mail/folder-browser.c:1166
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "_Konuya G�re Filtrele"
 
-#: mail/folder-browser.c:1169
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "_G�nderene G�re Filtrele"
 
-#: mail/folder-browser.c:1172
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "_Al�c�lara G�re Filtrele"
 
-#: mail/folder-browser.c:1175
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine G�re Filtrele"
 
-#: mail/folder-browser.c:1184
-msgid "_Open"
-msgstr "_A�"
-
-#: mail/folder-browser.c:1186
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Yeniden G�nder"
 
-#: mail/folder-browser.c:1188 ui/evolution-calendar.xml.h:52
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Farkl� Kaydet..."
 
-#: mail/folder-browser.c:1190 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Yazd�r"
 
-#: mail/folder-browser.c:1195 ui/evolution-mail-message.xml.h:83
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_G�nderene Cevapla"
 
-#: mail/folder-browser.c:1197 ui/evolution-mail-message.xml.h:59
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1199 ui/evolution-mail-message.xml.h:58
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "_T�m�ne Cevapla"
 
-#: mail/folder-browser.c:1201
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Y�nlendir"
 
-#: mail/folder-browser.c:1204
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_Okunmu� Olarak ��aretle"
 
-#: mail/folder-browser.c:1206
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oku_nmam�� Olarak ��aretle"
 
-#: mail/folder-browser.c:1211
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "�nemli"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Oku_nmam�� Olarak ��aretle"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Dizine Ta��..."
 
-#: mail/folder-browser.c:1213
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1222
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "G�ndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1231
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "�letiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1370
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "E-posta Listelerine G�re Filtreleme"
 
-#: mail/folder-browser.c:1371
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "E-posta Listesi �zerinde VFolder"
 
-#: mail/folder-browser.c:1373
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1374
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "E-posta Listesi �zerinde VFolder (%s)"
 
-#: mail/folder-browser-ui.c:252
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" �zellikleri"
-
-#: mail/folder-browser-ui.c:254
-msgid "Properties"
-msgstr "�zellikler"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "E-posta alma va g�nderme i�in Evolution bile�eni"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution e-posta program�."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-posta �zet bile�eni."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution e-posta dizin g�r�nt�leme bile�eni."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution e-posta dizin bile�eni"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution e-posta program� mimarisi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution e-posta bile�en mimarisi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "E-posta �zet bile�en mimarisi"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "�leti yap�land�rma aray�z�"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Mbox dosyalar�n� Evolution'a aktar�m mimarisi"
@@ -5893,20 +6655,26 @@ msgstr "pkutusu"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 "Gerekli t�m bilgiler verilmedi."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution Hesap D�zenleyici"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap D�zenleyici"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "�mzay� kaydet"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -5916,28 +6684,38 @@ msgstr ""
 "\n"
 "De�i�iklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (�ntan�ml�)"
 
-#: mail/mail-accounts.c:209
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Kapat"
 
-#: mail/mail-accounts.c:211 mail/mail-config.glade.h:36
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Etkinle�tir"
 
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:303
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Ger�ekten bu hesab� silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:463 mail/mail-accounts.c:467
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Sil"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Bunu �ntan�ml� hesab�m yap"
+
+#: 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 OK button and title
-#: mail/mail-accounts.c:650
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution Hesap Y�neticisi"
 
@@ -5965,7 +6743,7 @@ msgstr "%s posta listesi"
 msgid "Add Filter Rule"
 msgstr "Filtre Kural� Ekle"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5977,7 +6755,7 @@ msgstr ""
 "�nce yapman�z gerekiyor.\n"
 "�imdi yap�land�rmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5985,7 +6763,7 @@ msgstr ""
 "�leti g�ndermeden �nce kendinize\n"
 "ait bir kimlik olu�turmal�s�n�z."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5993,11 +6771,11 @@ msgstr ""
 "�leti g�ndermeden �nce bir posta\n"
 "iletim ayar� yapmal�s�n�z."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim y�ntemi d�zenlenmemi�"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6005,7 +6783,7 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de g�nderilsin mi?"
 
-#: mail/mail-callbacks.c:272
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6013,40 +6791,41 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "Bu ileti sadece gizli al�c� i�eriyor. \n"
-"E-posta sunucusu t�m al�c�lar� Apparently-to ba�l��� ekleyerek g�r�n�r "
-"hale getirebilir.\n"
+"E-posta sunucusu t�m al�c�lar� Apparently-to ba�l��� ekleyerek g�r�n�r hale "
+"getirebilir.\n"
 "Yine de g�ndereyim mi?"
 
-
-#: mail/mail-callbacks.c:358
+#: mail/mail-callbacks.c:359
 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:409
+#: mail/mail-callbacks.c:410
 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:654
+#: mail/mail-callbacks.c:653
+#, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s tarihinde, %s dedi ki:"
 
-#: mail/mail-callbacks.c:873
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Y�nlendirilmi� ileti:\n"
 
-#: mail/mail-callbacks.c:967
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "�letileri buraya ta��"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "�leti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:1323
+#: mail/mail-callbacks.c:1374
+#, 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:1345
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6054,7 +6833,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri d�zenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:1379
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6062,35 +6841,24 @@ msgstr ""
 "Sadece G�nderilen dizinine kaydedilen\n"
 "iletileri yeniden g�nderebilirsiniz."
 
-#: mail/mail-callbacks.c:1391
+#: mail/mail-callbacks.c:1442
+#, 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:1412
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Hi� �leti Se�ilmedi"
 
-#: mail/mail-callbacks.c:1446 mail/mail-display.c:96
-msgid "Overwrite file?"
-msgstr "Dosya �zerine yaz�ls�n m�?"
-
-#: mail/mail-callbacks.c:1450 mail/mail-display.c:100
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ayn� isimde bir dosya zaten var\n"
-"�zerine yaz�ls�n m�?"
-
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "�letiyi Farkl� Kaydet..."
 
-#: mail/mail-callbacks.c:1496
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "�letileri Farkl� Kaydet..."
 
-#: mail/mail-callbacks.c:1681
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6099,22 +6867,23 @@ msgstr ""
 "Filtre bilgisini y�klerken hata olu�tu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1739
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtreler"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "�letiyi Yazd�r"
 
-#: mail/mail-callbacks.c:1786
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "�letiyi yazd�r�lmas�nda hata"
 
-#: mail/mail-callbacks.c:1881
+#: mail/mail-callbacks.c:1966
+#, 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?"
 
-#: mail/mail-config.c:1503 mail/mail-config.c:1506
-msgid "Connecting to server..."
-msgstr "Sunucuya ba�lant� kuruluyor..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6158,10 +6927,14 @@ 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:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution Hesap Sihirbaz�"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Sunucuya ba�lant� kuruluyor..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Desteklenen t�rleri denetle "
@@ -6171,58 +6944,63 @@ msgid " color"
 msgstr " renk"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Bu �ifreleme ile imza desteklenmiyor"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Hesap"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Hesap Y�neticisi"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Kimlik Denetim T�r�: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "E-postalar� otomatik denetle:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "Sertifika No:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "D�zenleyici"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6238,231 +7016,279 @@ msgstr ""
 "\n"
 "Ayarlar�n�z� kaydetmek i�in \"Bitir\" d��mesine t�klay�n."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "�_ntan�ml�"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "�ntan�ml� \"Y�nlendirme\" t�r�: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "�ntan�ml� karakter k�mesi: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "Say�sal Numaralar..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Tamamland�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Taslaklar dizini:"
 
-#: 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:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "D�zenle..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-posta Adresi:"
 
 #: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Etkinle�tir"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Tam �sim:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Say�sal Numaray� Al..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "HTML �mzas�:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Highlight citations with"
 msgstr "Renklendir: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "HTML iletide"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Inline"
 msgstr "_Ba�lant�da"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "G�nderici adres defterinde ise resimleri y�kle"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "E-posta Yap�land�rmas�"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Posta Kutusu Bi�imi"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Bunu �ntan�ml� hesab�m yap"
 
-#: mail/mail-config.glade.h:50
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "�letileri okunmu� olarak i�aretle:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Sunucusu"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Haberler"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Se�imlik Bilgiler"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Kurum:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "PGP Anahtar Numaras�:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP program yolu:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Bir renk se�in"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:72
+#, 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:73
+#, 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:74
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotelenmi�"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "E-posta Al�n�yor"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "E-posta Al�n�yor"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Alma Se�enekleri"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "�stenen Bilgiler"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "G�venli MIME"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "G�venlik"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP program�n� se�in"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "E-postalar� �ntan�ml� olarak HTML g�nder."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "E-posta G�nderiliyor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "E-posta G�nderiliyor"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "G�nderildi"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "G�nderilen ve Taslak �letileri"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "G�nderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Sunucu Yap�land�rmas�"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Sunucu T�r�: "
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "�mza dosyas�:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Kaynaklar"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Bilgi Yok"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "�zel Dizinler"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyas�"
 
-#: mail/mail-config.glade.h:90
-msgid "Type"
-msgstr "T�r"
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "G�venli ba�lant� (SSL) kullan"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Kullan�c� ad�:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6472,223 +7298,229 @@ msgstr ""
 "\n"
 "Devam etmek i�in \"�leri\" d��mesine t�klay�n."
 
-#: mail/mail-config.glade.h:98 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "_D�zenle"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "saniye."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "PGP imza dosyas� olu�turulamad�."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "PGP onaylama dosyas� olu�turulamad�."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "PGP �ifreleme dosyas� olu�turulamad�."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "PGP �ifre a�ma dosyas� olu�turulamad�."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME imzas� olu�turulamad�."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME �ifreli i�erik (sadece serifikal�) olu�turulam�yor."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME �ifreli i�erik olu�turulam�yor."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME �ifreli zarf i�eri�i olu�turulam�yor."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama i�eri�i olu�turulam�yor."
 
-#: mail/mail-display.c:200
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:240
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ge�ici dizin yarat�lamad�: %s"
-
-#: mail/mail-display.c:301
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Diske Kaydet..."
 
-#: mail/mail-display.c:303
-#, c-format
-msgid "Open in %s..."
-msgstr "%s i�inde a�..."
-
-#: mail/mail-display.c:305
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "�zle"
 
-#: mail/mail-display.c:340
-msgid "External Viewer"
-msgstr "Harici �zleyici"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s i�inde a�..."
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�zle (%s kullanarak)"
 
-#: mail/mail-display.c:367
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:961
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Harici �zleyici"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "�leti i�eri�i y�kleniyor"
 
-#: mail/mail-display.c:1280
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Ba�lant�y� Taray�c�da A�"
 
-#: mail/mail-display.c:1282
-msgid "Save as (FIXME)"
-msgstr "Farkl� kaydet"
-
-#: mail/mail-display.c:1284
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-format.c:532
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "Farkl� kaydet"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Farkl� kaydet..."
+
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d dakika"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d saniye"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi a��lamad�: Kaynak kodu g�steriliyor."
 
-#: mail/mail-format.c:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-posta Adresi:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "G�nderen"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Yan�tla:"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Al�c�"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP program yap�land�r�lmad�."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "�ifrelenmi� ileti g�sterilemiyor"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "�ifrelenmi� ileti"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "�ifreyi a�mak i�in simgeye t�klay�n"
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1377
 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:1182
+#: mail/mail-format.c:1388
 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:1833
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine ba� (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2060
 #, 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:1849
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya ba� (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP adresine ba� (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye ba� (\"%s\" t�r�nde)"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Bozuk harici g�vde"
 
-#: mail/mail-local.c:506
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' a��l�yor"
 
-#: mail/mail-local.c:805
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" bi�iminden \"%s\" bi�imine ge�iliyor"
 
-#: mail/mail-local.c:809
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" bi�iminden \"%s\" bi�imine ge�"
-
-#: mail/mail-local.c:832
-msgid "Reconfiguring folder"
-msgstr "Dizin yeniden yap�land�r�l�yor"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:861
-msgid "Closing current folder"
-msgstr "Ge�erli dizin kapat�l�yor"
-
-#: mail/mail-local.c:893
-msgid "Renaming old folder and opening"
-msgstr "Yeni dizinin ad� de�i�tiriliyor ve a��l�yor"
-
-#: mail/mail-local.c:911
-msgid "Creating new folder"
-msgstr "Yeni dizin yarat�l�yor"
-
-#: mail/mail-local.c:925
-msgid "Copying messages"
-msgstr "�letiler kopyalan�yor"
-
-#: mail/mail-local.c:942
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6697,7 +7529,7 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. B�y�k ihtimalle bu dizini \n"
 "yeniden a�amayacaks�n�z: %s"
 
-#: mail/mail-local.c:981
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6705,11 +7537,17 @@ msgstr ""
 "E�er bu dizini tekrar a�amazs�n�z, elle \n"
 "d�zeltme yapmak zorunda kalacaks�n�z."
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Bu ��p dizininden iletileri kopyalayamazs�n�z."
+
+#: mail/mail-local.c:1011
+#, c-format
 msgid "Reconfigure %s"
 msgstr "Yeniden Yap�land�r: %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6718,7 +7556,7 @@ msgstr ""
 "'%s' s�ras�nda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6727,117 +7565,104 @@ msgstr ""
 "��lem s�ras�nda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "�al���yor"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Evolution i�lemleri"
-
-#: mail/mail-ops.c:616
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" g�nderiliyor"
 
-#: mail/mail-ops.c:620
-msgid "Sending message"
-msgstr "�leti g�nderiliyor"
-
-#: mail/mail-ops.c:735
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti g�nderiliyor"
 
-#: mail/mail-ops.c:754
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:756 mail/mail-send-recv.c:493
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Tamamland�."
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "�letiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�letiler %s'e ta��n�yor"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�letiler %s'e kopyalan�yor"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Ta��n�yor"
 
-#: mail/mail-ops.c:937
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopyalan�yor"
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" i�inde dizinler taran�yor"
 
-#: mail/mail-ops.c:1176
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "��p"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Y�nlendirilen iletiler"
 
-#: mail/mail-ops.c:1217 mail/mail-ops.c:1355
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini a��l�yor"
 
-#: mail/mail-ops.c:1284
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu a��l�yor"
 
-#: mail/mail-ops.c:1423
+#: mail/mail-ops.c:1436
+#, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1510
-msgid "Moving folder %s to %s"
-msgstr "%s dizini %s adresine ta��n�yor"
-
-#: mail/mail-ops.c:1512
-msgid "Copying folder %s to %s"
-msgstr "%s dizini %s adresine kopyalan�yor"
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1701
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1750
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi al�n�yor"
 
-#: mail/mail-ops.c:1817
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "�letiler al�n�yor"
 
-#: mail/mail-ops.c:1827
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "%d/%d ileti al�n�yor (uid \"%s\")"
-
-#: mail/mail-ops.c:1901
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "�letiler kaydediliyor"
 
-#: mail/mail-ops.c:1980
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6846,12 +7671,7 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1993
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%d/%d ileti kaydediliyor (uid \"%s\")"
-
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6860,11 +7680,11 @@ msgstr ""
 "�letilerin kayd�nda hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6873,12 +7693,12 @@ msgstr ""
 "��k�� dosyas� yarat�lamad�: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yaz�lamad�: %s."
 
-#: mail/mail-ops.c:2191
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ba�lant�s� kesiliyor"
@@ -6887,159 +7707,166 @@ msgstr "%s ba�lant�s� kesiliyor"
 msgid "(Untitled Message)"
 msgstr "(Ba�l�ks�z �leti)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Ba�l�ks�z �leti)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "�leti"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "�letide Bul"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "K���k/b�y�k Harfe Duyarl�"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "�leri Do�ru Arat"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Bul:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "E�le�enler:"
 
-#: mail/mail-send-recv.c:142
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "�ptal ediliyor..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "E-posta Al & G�nder"
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Al�n�yor"
 
-#: mail/mail-send-recv.c:303
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "G�ncelleniyor..."
 
-#: mail/mail-send-recv.c:305 mail/mail-send-recv.c:351
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-send-recv.c:324
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "G�nderiliyor"
 
-#: mail/mail-send-recv.c:489
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "�ptal edildi."
 
-#: mail/mail-tools.c:158
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Kullan�c� i�lemi iptal etti."
+
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ge�ici ileti kutusu '%s' haz�rlanamad�: %s"
 
-#: mail/mail-tools.c:206
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (y�nlendirilmi� ileti)"
-
-#: mail/mail-tools.c:216
-msgid "Fwd: (no subject)"
-msgstr "�lt: (konusuz)"
-
-#: mail/mail-tools.c:233
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Y�nlendirilmi� ileti - %s"
 
-#: mail/mail-tools.c:235
-msgid "Forwarded message (no subject)"
-msgstr "Y�nlendirilmi� ileti (konusuz)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Y�nlendirilen iletiler"
 
-#: mail/mail-tools.c:554
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Y�nlendirilmi� �leti-----<br><b>G�nderen:</b> %s<br><b>Al�c�:</b> %s<br><b>Konu:"
-"</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Y�nlendirilen iletiler"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "G�r�nmeyen"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "G�r�nen"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "�oklu G�r�lmeyen �leti"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "�oklu �letiler"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "En D���k"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "D���k"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Y�ksek"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "En Y�ksek"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Bug�n %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "D�n %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "�letiler kaydediliyor"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "��aretli"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Al�nd�"
 
@@ -7047,10 +7874,6 @@ msgstr "Al�nd�"
 msgid "Size"
 msgstr "Boyut"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "Kullan�c� i�lemi iptal etti."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dizin"
@@ -7079,7 +7902,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden �yelik siliniyor"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:877
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "�yelikleri D�zenle"
 
@@ -7095,44 +7918,85 @@ msgstr "Evolution �zet bile�en mimarisi."
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution �zet bile�eni ilklendirilemedi."
 
-#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Randevular"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Randevu yok"
 
-#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
-msgid "%I:%M%p"
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l %M %p"
+
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "�leti �zeti"
 
-#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution Ayarlar�..."
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>RDF indirirken bir hata olu�tu</b>"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Yeni G�rev"
+
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary-weather.c:296
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Metar indirirken bir hata olu�tu</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: my-evolution/e-summary-weather.c:600
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "B�l�mler"
 
-#: my-evolution/e-summary.c:410 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%d %B %A"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print My Evolution"
 msgstr "Evolution"
 
-#: my-evolution/e-summary.c:456
+#: my-evolution/e-summary.c:518
 #, fuzzy
 msgid "Printing of My Evolution failed"
 msgstr "�letiyi yazd�r�lmas�nda hata"
@@ -7141,95 +8005,95 @@ msgstr "�letiyi yazd�r�lmas�nda hata"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo ba�lat�lamad�.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "G�ky�z�n� temizle"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Par�al� bulutlu"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Da��n�k bulutlu"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Az bulutlu"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "Ge�ersiz"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "De�i�ken"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "Kuzey"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "Kuzey - Kuzeydo�u"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "Kuzeydo�u"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "Do�u - Kuzeydo�u"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "Do�u"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "Do�u - G�neydo�u"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "G�neydo�u"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "G�ney - G�neydo�u"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "G�ney"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "G�ney - G�neybat�"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "G�neybat�"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "Bat� - G�neybat�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "Bat�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "Bat� - Kuzeybat�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "Kuzeybat�"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "Kuzey - Kuzeybat�"
 
@@ -7237,1085 +8101,1224 @@ msgstr "Kuzey - Kuzeybat�"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 #, fuzzy
 msgid "Showers"
 msgstr "G�ster"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "Ya�murlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Yer yer ya�murlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Hafif ya�murlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Orta ya�mur"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr "K�smi ya�murlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Drifting rain"
 msgstr "A��klama i�eri�i"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Yeniden Ara"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "Karl�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Yer yer kar ya����"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Hafif kar ya����"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Orta �iddette kar ya����"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "A��r kar ya����"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Kar f�rt�nas�"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "A��klama i�eri�i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Yer yer buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Az derecede buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Buz f�rt�nas�"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Hail"
 msgstr "E-posta"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Partial hail"
 msgstr "Birincil E-posta Adresi"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Freezing hail"
 msgstr "E-posta Al�n�yor"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "T�m�n� G�ster "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "T�m�n� G�ster "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Bilinmeyen hata"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Toplant� Davetleri"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "Hafif sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr "Kal�n sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "B�l�m b�l�m sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Drifting mist"
 msgstr "E-posta listesi"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Shallow fog"
 msgstr "T�m�n� G�ster "
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke"
 msgstr "Sakla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "G�revleri g�ster"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "Volkanik k�l"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Yer yer volkanik k�l"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Orta derecede volkanik k�l"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr "Kal�n volkanik k�l"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "K�smi volkanik k�l"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr "Kumlu"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 #, fuzzy
 msgid "Haze"
 msgstr "�stbilgi"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 #, fuzzy
 msgid "Sprays"
 msgstr "g�n"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 #, fuzzy
 msgid "Dust"
 msgstr "A�ustos"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Kas�rga"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Yer yer kas�rga"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Orta �iddette kas�rga"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr ""
 
-#: shell/e-activity-handler.c:174 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "�ptal"
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Cevaplanan"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Dizini se�in"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "T�m Kat�l�mc�lar"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Bununla ba�layan dizinleri g�ster:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Bununla ba�layan dizinleri g�ster:"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "G�sterim"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Cuma"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Ayarlar"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 g�n"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "ay"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 hafta"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Toplant� Zaman� D�zenle"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "T�m�n� G�ster"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "_Kapsaml� Ba�l�klar� G�ster"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "G�revler"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  �nite:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Hava Durumu"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Nisan"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution kabu�u."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Ayr�nt�lar"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Toplant�y� �_ptal Et"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "�zel Dizinler"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution kurulumu"
 
@@ -8337,21 +9340,17 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Dosyalar d�zg�n bir �ekilde g�ncellenemedi"
 
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Evolution dosyalar� ba�ar�yla kuruldu."
-
-#: shell/e-setup.c:202
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Evolution'u ilk defa �al��t�r�yorsunuz."
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution kullan�c� dosyalar�n� buraya kurmak i�in \"Tamam\" d��mesine "
 "t�klay�n."
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8362,16 +9361,16 @@ msgstr ""
 "\n"
 "Hata: %s"
 
-#: shell/e-setup.c:237
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 "Dosyalar kopyalanamad�\n"
 "`%s'."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8382,7 +9381,7 @@ msgstr ""
 "Evolution kullan�c� dosyalar�n�n y�klenmesi\n"
 "bunu silmelisiniz."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8391,7 +9390,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8402,53 +9401,56 @@ 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.c:433
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerel kay�t kurulamad� -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "%s dizini al�namad�: %s"
 
-#: shell/e-shell.c:1281
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Dosyalar kopyalanamad�\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"`%s g�r�n�m� beklenmeyen bir �ekilde sonland�r�ld�.\n"
-"%s bile�eni ��kt�."
 
-#: shell/e-shell-folder-commands.c:242
+#: shell/e-shell-folder-commands.c:270
 #, 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:247
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:313
 #, 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:290
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Dizini ta��"
 
-#. Popup a dialog asking if they are sure they want to delete
-#. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:354
+#, c-format
 msgid "Delete folder '%s'"
 msgstr "'%s' dizinini sil"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:363
+#, 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:390
+#: shell/e-shell-folder-commands.c:422
+#, c-format
 msgid "Rename folder '%s'"
 msgstr "'%s' dizini yeniden isimlendir"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -8457,11 +9459,11 @@ msgstr ""
 "Belirlenen dizin yarat�lamad�:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Belirtilen dizin ad� ge�erli de�ildir."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Yeni dizin yarat"
 
@@ -8473,11 +9475,11 @@ msgstr ""
 "�stenen i�lem i�in se�ili dizin tipi \n"
 "ge�erli de�ildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Yeni..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
@@ -8586,50 +9588,19 @@ msgstr "Bu veriyi almak i�in hedef dizin se�in"
 msgid "Closing connections..."
 msgstr "Ba�lant�lar kesiliyor..."
 
-#: shell/e-shell-view.c:174
-msgid "(No folder displayed)"
-msgstr "(dizin g�sterilmiyor)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1387 shell/e-storage-set-view.c:1440
-msgid "My Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1404
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1406
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1444
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution �evrimi�i �l���yor. Bu d��meye t�klayarak �evrimd��� �al��mas�n� sa�lay�n."
-
-#: shell/e-shell-view.c:1451
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution �evrimd��� �al��mak �zere haz�rlan�yor."
-
-#: shell/e-shell-view.c:1457
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution �evrimd��� �al���yor. Bu d��meye t�klayarak �evrimi�i �al��mas�n� sa�lay�n."
-
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamad�."
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy �al��t�r�lamad�."
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Telif hakk� 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -8638,43 +9609,90 @@ msgstr ""
 "Evolution, GNOME masa�st� i�in bir e-posta, \n"
 "takvim ve ileti�im listesi y�netim uygulamas�d�r."
 
-#: shell/e-shell-view-menu.c:464
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "A�mak istedi�iniz dizini se�in"
 
-#: shell/e-shell-view-menu.c:610
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Yeni bir k�sayol yarat"
 
-#: shell/e-shell-view-menu.c:611
+#: shell/e-shell-view-menu.c:584
 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:718
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "�evrimi�i �al��"
 
-#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
-msgid "Work offline"
-msgstr "�evrimd��� �al��"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "�evrimd��� �al��"
 
-#: shell/e-shortcuts.c:596
-msgid "Error saving shortcuts."
-msgstr "K�sayollar� kaydederken hata oldu."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(dizin g�sterilmiyor)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shortcuts-view.c:136
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution �evrimi�i �l���yor. Bu d��meye t�klayarak �evrimd��� �al��mas�n� "
+"sa�lay�n."
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution �evrimd��� �al��mak �zere haz�rlan�yor."
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution �evrimd��� �al���yor. Bu d��meye t�klayarak �evrimi�i �al��mas�n� "
+"sa�lay�n."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerel kay�t kurulamad� -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"`%s g�r�n�m� beklenmeyen bir �ekilde sonland�r�ld�.\n"
+"%s bile�eni ��kt�."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Yeni bir k�sayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Grup ad�:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -8683,155 +9701,194 @@ msgstr ""
 "K�sayol �ubu�undan `%s' grubunu \n"
 "kald�rmak istiyor musunuz?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Silme"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "K�sayol Grubunu Yeniden �simlendir"
 
-#: shell/e-shortcuts-view.c:293
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Se�ili k�sayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:303
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_K���k Simgeler"
 
-#: shell/e-shortcuts-view.c:304
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "K�sayollar� k���k simgeler olarak g�ster"
 
-#: shell/e-shortcuts-view.c:306
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_B�y�k Simgeler"
 
-#: shell/e-shortcuts-view.c:307
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "K�sayollar� b�y�k simgeler olarak g�ster"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:319
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Yeni bir k�sayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:321
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Bu Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:322
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Bu k�sayolu grubunu sil"
 
-#: shell/e-shortcuts-view.c:324
-msgid "Re_name This Group..."
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden �simlendir..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Bu k�sayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "K�sayol �ubu�unu _Gizle"
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "K�sayol �ubu�unu gizle"
 
-#: shell/e-shortcuts-view.c:450
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "K�sayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:451
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Se�ili k�sayollar� yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:463
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "A�"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu k�sayola ba�l� dizini a�"
 
-#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:25
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Yeni Pencerede A�"
 
-#: shell/e-shortcuts-view.c:465
+#: shell/e-shortcuts-view.c:476
 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:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Bu k�sayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu k�sayolu k�sayol �ubu�undan sil"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "K�sayollar� kaydederken hata oldu."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_K�sayol �ubu�u"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "pkutusu"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Ba�lant�"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(isimsiz)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ayn� isimli bir dizin zaten var"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin t�r� ge�erli de�ildir"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "G/� hatas�"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak i�in gerekli disk alan� yok"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamad�"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "�zin yok"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "��lem desteklenmiyor"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kay�tta belirtilen tip desteklenmiyor"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamland�)"
 
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Ba�lant�lar kesiliyor..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Makina:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Dizin ad�:"
@@ -8844,10 +9901,6 @@ msgstr "Dizin t�r�:"
 msgid "Specify where to create the folder:"
 msgstr "Dizinin nerede yarat�laca��n� belirtin:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution kabu�u."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"Aktar\" d��mesine t�klayarak dosyalar� Evolution'a aktar�n."
@@ -8877,22 +9930,26 @@ msgstr "Al�c�lar"
 msgid "Don't import"
 msgstr "Alma"
 
-#: shell/main.c:89
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Tekrar sorma"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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"
@@ -8903,7 +9960,7 @@ msgstr ""
 "Evolution geni� bir geli�tirici grubu taraf�ndan haz�rlanmaktad�r. Sizlerin "
 "de deste�ini bekliyoruz.\n"
 
-#: shell/main.c:114
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -8911,28 +9968,28 @@ msgstr ""
 "Te�ekk�rler\n"
 "Evolution Grubu\n"
 
-#: shell/main.c:152
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Evolution kabu�una eri�im yap�lamad�."
 
-#: shell/main.c:211
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "A��l�� ekran�ni g�sterme"
 
-#: shell/main.c:212
+#: shell/main.c:216
 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:247
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo par�alar sistemi ba�lat�lamad�."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:2
-msgid "C_ut"
-msgstr "_Kes"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopyala"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Se�imi kopyala"
 
@@ -8944,7 +10001,11 @@ msgstr "Yeni bir ba�lant� yarat"
 msgid "Create new contact list"
 msgstr "Yeni bir ba�lant� listesi yarat"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Kes"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Se�imi kes"
 
@@ -8960,7 +10021,11 @@ msgstr "Yeni ba�lant�"
 msgid "New list"
 msgstr "Yeni liste"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Yap��t�r"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Panoyu yap��t�r"
 
@@ -9000,19 +10065,8 @@ msgstr "_Ba�lant�"
 msgid "_Contact Group"
 msgstr "_Ba�lant� Grubu"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:45
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "_Kopyala"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:50
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "_Yap��t�r"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:51
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Yazd�r..."
 
@@ -9024,159 +10078,131 @@ msgstr "Ba�_lant�lar� ara"
 msgid "_Select All"
 msgstr "_Hepsini Se�"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:53
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Ara�lar"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 G�n"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Tercihleri de�i�tir"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Yeni bir t�m g�n olay� yarat"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Yeni bir randevu yarat"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Yeni bir takvim yarat"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu yarat"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "G�n"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Git"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Zamanda geriye git"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Zamanda ileri git"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "_Tarihe Git"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "_Bug�ne Git"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Belirli bir tarihe git"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "�imdiki zamana git"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Ay"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Yeni _Olay"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:46
-msgid "Next"
-msgstr "�_leri"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Takvimi A�"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Geri"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Yeni Randevu"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Yazd�r�lacak olan takvimi �nizler"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Takvimi yazd�r"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Bu Takvimi Yazd�r"
 
-#: ui/evolution-calendar.xml.h:34 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Farkl� Kaydet"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "�stenen Bilgiler"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "Save calendar as something else"
-msgstr "Takvimi farkl� kaydet"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 g�n g�ster"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 ay g�ster"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "1 hafta g�ster"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "�al��ma g�nlerini g�ster"
 
-#: ui/evolution-calendar.xml.h:41 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Bug�n"
-
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "�_al��ma haftas�"
 
-#: ui/evolution-calendar.xml.h:43
-msgid "Week"
-msgstr "Hafta"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Randevu"
 
-#: ui/evolution-calendar.xml.h:46
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "E-posta Ayarlar�..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_G�n"
 
-#: ui/evolution-calendar.xml.h:47
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Ay"
 
-#: ui/evolution-calendar.xml.h:48 ui/evolution.xml.h:58
-msgid "_New"
-msgstr "_Yeni"
-
-#: ui/evolution-calendar.xml.h:49
-msgid "_Open Calendar"
-msgstr "_Takvimi A�"
-
-#: ui/evolution-calendar.xml.h:54
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Hafta"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Kapat"
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Kapat"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9187,7 +10213,7 @@ msgid "Delete this appointment"
 msgstr "Bu randevuyu sil"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:21
 msgid "Main toolbar"
 msgstr "Ana ara� �ubu�u"
 
@@ -9195,7 +10221,7 @@ msgstr "Ana ara� �ubu�u"
 msgid "Preview the printed item"
 msgstr "Yazd�r�lacak olan ��eyi �nizle"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Yazd�rma �_nizlemesi"
 
@@ -9204,22 +10230,15 @@ msgid "Print S_etup"
 msgstr "Yazd�rma _Ayarlar�"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Bu ��eyi yazd�r"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Yazd�r..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Farkl� Kaydet..."
-
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Kaydet ve Kapat"
 
@@ -9239,18 +10258,15 @@ msgstr "G�ncel yaz�c� i�in sayfa ayarlar�n� yap"
 msgid "_Action"
 msgstr "E_ylemler"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Dosya"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "_Yard�m"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Bu ��eyi sil"
@@ -9265,13 +10281,12 @@ msgid "Help"
 msgstr "Yard�m"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "_Zarf� Yazd�r..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Farkl� Kaydet..."
 
@@ -9292,26 +10307,31 @@ msgid "Send _message to contact..."
 msgstr "Ba�lant�ya _ileti g�nder..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Kaydet"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Bu grubu sil"
+#, fuzzy
+msgid "Delete this list"
+msgstr "Bu ��eyi sil"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Bu grubu kaydet ve pencereyi kapat"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Ba�lant�y� kaydet ve diyalog penceresini kapat"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "G_rubu ba�kas�na g�nder..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "_Ba�lant�y� ba�kas�na g�nder..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "�letiyi gruba g�nder..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Ba�lant�ya _ileti g�nder..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -9346,7 +10366,7 @@ msgid "Schedule a meeting for this item"
 msgstr "Bu ��e _i�in toplant� zaman� d�zenle"
 
 #: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:42
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "E_ylemler"
 
@@ -9354,6 +10374,10 @@ msgstr "E_ylemler"
 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"
@@ -9363,78 +10387,83 @@ msgid "Compose"
 msgstr "D�zenle"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Bir ileti yaz"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "E-posta hesaplar�n� d�zenle ve di�er se�enekler"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Yeni iletileri s�zmek i�in kural olu�tur"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Sanal dizin tan�mlar� olu�tur/d�zenle"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "��p� _Bo�alt"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Parolalar� _Unut"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Bilinen parolalar� unut (t�m parolalar� yeniden girmeniz gerekecektir)"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "�yelikleri _D�zenle..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "�letiyi d�zenlemek i�in bir pencere a�"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "T�m dizindeki t�m silinmi� iletileri tamamen sil"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Al / G�nder"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Kuyruktaki iletileri g�nder ve yeni iletileri al"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "�leti �nizleme penceresini g�ster"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Uzak sunuculardaki dizinlere �yelik i�lemini ger�ekle�tir"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "Sanal Dizin _D�zenleyici..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtreler..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_�letiyi G�nder"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "E-posta Ayarlar�..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "�nizleme _Panosu"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_G�nder / Al"
 
@@ -9459,14 +10488,14 @@ msgid "Hide _Deleted Messages"
 msgstr "_Silenen �letileri Gizle"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "_Okunan �letileri Gizle"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Silinen iletileri �zerine �izgi �ekmek yerine gizle"
+msgstr "Silinen iletileri �zerine �izgi �ekmek yerine gizle"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark All as R_ead"
@@ -9484,7 +10513,7 @@ msgstr "�letiyi panoya yap��t�r"
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Bu dizindeki t�m silinmi� iletileri tamamen sil"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "T�m�n� _Se�"
 
@@ -9528,7 +10557,7 @@ msgstr "Konumland�r�lan �leti listesi"
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Dizin"
 
@@ -9536,7 +10565,7 @@ msgstr "_Dizin"
 msgid "_Invert Selection"
 msgstr "S_e�imi Tersine �evir"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:60
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "�_zellikler..."
 
@@ -9629,19 +10658,23 @@ msgid "Display the previous unread message"
 msgstr "�nceki okunmam�� iletiyi g�ster"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "_E-posta Listelerine G�re Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "_G�nderene G�re Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "_Al�c�lara G�re Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "_Konuya G�re Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -9688,189 +10721,239 @@ msgstr "Se�ilen iletiyi birisine y�nlendir"
 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:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Resimleri _Y�kle"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "Okunmu� Olarak ��aretle"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "�nemli"
 
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Oku_nmam�� Olarak ��aretle"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Se�ili iletileri okunmu� olarak i�aretle"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Se�ili iletileri silmek i�in i�aretle"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Se�ili iletileri okunmam�� olarak i�aretle"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Se�ili iletileri silmek i�in i�aretle"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Se�ili iletileri silmek i�in i�aretle"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Ta��"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Se�ili iletileri ba�ka bir dizine ta��"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "�_leri"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Sonraki �nemli iletiyi g�ster"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "�leti"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Konumu _Se�"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "(Ba�l�ks�z �leti)"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Se�ilen iletiyi yeni bir pencerede a�"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:57
 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:49
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Yazd�r�lacak olan iletiyi �nizler"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Geri"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "�nceki �nemli iletiyi g�ster"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "�letiyi Yazd�r"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "�nceki okunmam�� iletiyi g�ster"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "�letiyi Yazd�r..."
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Yazd�rma �nizlemesi..."
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Print message to the printer"
-msgstr "�letiyi yaz�c�ya g�nder"
-
-#: ui/evolution-mail-message.xml.h:55
-msgid "Redirect (FIXME: implement me)"
-msgstr "Y�nlendir"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "�letiyi Yazd�r"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Cevapla"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "T�m�ne cevapla"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "�le_ti Ara"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "�letiyi bir dosyaya kaydet"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:73
 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:63
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "�leti _Kayna��n� G�ster"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "_Kapsaml� Ba�l�klar� G�ster"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "�letiyi normal bi�emde g�ster"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "�letiyi t�m ba�l�klar�yla g�ster"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "�letinin kayna��n� g�ster"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Se�ilen iletiyi silme"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "_E-posta Listesine G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "_G�nderene G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "_Al�c�lara G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "_Konuya G�re VFolder..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Filtreleri Uygula"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "�_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "�letiyi _Y�nlendir"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "�leti _G�r�n�m�"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "Dizine _Ta��"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "Normal _G�sterim"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "�_letiyi A� "
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "�_letiyi Yeniden G�nder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
 msgstr "_Ara� �ubuklar�n� �zelle�tir..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 msgid "Customize"
 msgstr "�_zelle�tir"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
 msgid "Customize toolbars"
 msgstr "Ara� �ubuklar�n� �zelle�tir"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "_Kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 msgid "_View"
 msgstr "_G�ster"
 
@@ -9878,11 +10961,7 @@ msgstr "_G�ster"
 msgid "Attach"
 msgstr "Ekle"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Bir dosya ekle"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "G�ncel dosyay� kapat"
 
@@ -9907,50 +10986,57 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Metin dosyas� ekle..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Bir dosyay� ileti i�ine ekle"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Metin dosyas� ekle..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Bir dosya a�"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP �ifre"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP �mza"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME �ifreleme"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME �mza"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:241
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Kaydet"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "_Tasla�� Kaydet"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Farkl� Kaydet"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Di_zine kaydet..."
+msgid "Save _Draft"
+msgstr "_Tasla�� Kaydet"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Dizine kaydet..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "�imdiki zaman� kaydet"
 
@@ -10023,33 +11109,36 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Yan�tla alan�n� g�sterir/gizler"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Dosya ekle..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Gizli Alan�"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Bilgi Alan�"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Hata ay�kla"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "He_psini sil"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_G�nderen Alan�"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Metin dosyas� ekle..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_A�..."
@@ -10062,31 +11151,35 @@ msgstr "_Yan�tla Alan�"
 msgid "_Security"
 msgstr "_G�venlik"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Yard�m"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Bu dizini �ye dizinler listesine ekle"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Dizin"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Listeyi Tazele"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Dizin Listesini Tazele"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Bu dizini �ye diziler listesinden sil"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "�ye ol"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "�yelikten ��k"
 
@@ -10102,6 +11195,10 @@ msgstr "G�revi Da��t"
 msgid "Re_fresh Task"
 msgstr "G�revi _Tazele"
 
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Se�ili g�revi kopyala"
@@ -10114,6 +11211,10 @@ msgstr "Yeni bir g�rev yarat"
 msgid "Cut selected task"
 msgstr "Se�ili G�revi Sil"
 
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Se�ilen g�revleri sil"
+
 #: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Yeni G�rev"
@@ -10122,15 +11223,16 @@ msgstr "Yeni G�rev"
 msgid "Paste task from the clipboard"
 msgstr "Panodan g�revi yap��t�r"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "G�revi farkl� kaydet"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "G�rev Tercihleri..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "E-posta Ayarlar�..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_G�rev"
 
@@ -10146,183 +11248,180 @@ msgstr "_K�sayol �ubu�una Ekle"
 msgid "Change the name of this folder"
 msgstr "Bu dizinin ad�n� de�i�tir"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Bu dizinin �zelliklerini de�i�tir"
-
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Bu Dizini Kopyala"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Yeni Bir _Dizin Yarat..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "K�sayol �ubu�unda bu dizine bir ba�lant� olu�tur"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Yeni bir dizin yarat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Bu dizini sil"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Farkl� bir dizin g�ster"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "��_k"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution _SSS"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _Penceresi"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolution �ubu�u _k�sayolu"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Programdan ��k"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Ba�lang��"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Harici dosya bi�imini aktar"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Bu dizini ba�ka bir yere ta��"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Y_eni Pencerede A�"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Bu dizini yeni bir pencerede a�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution hakk�nda bilgi ver"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Hata Raporu G�nder"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu G�nder"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "_Bug Buddy kullanarak hata raporu g�nder."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "A�/kapat"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin �ubu�unu g�ster/gizle"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "K�sayol �ubu�unu g�ster/gizle"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "�evrimi�i/�evrimd��� �al��."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "_Ba�lant� Y�neticisini Kullanarak"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Takvim Kullanarak"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "_Postalay�c� Kullanarak"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Se�ili dizini g�ster"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "�evrimd��� �al��"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Evolution Hakk�nda..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Randevu"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Ba�lant� (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Dizin �ubu�u"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Dosya _ekle..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "�_ndex"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "�_letiyi postala"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Ta��..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Yeni"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Y_eniden �simlendir..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_K�sayol �ubu�u"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_K�sayol �ubu�u"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_G�rev (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "�e_vrimd��� �al��"
 
@@ -10346,22 +11445,6 @@ msgstr "�irket"
 msgid "Phone List"
 msgstr "Telefon Listesi"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "G�n G�r�n�m�"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Ay G�r�n�m�"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Hafta G�r�n�m�"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "�al��ma Haftas� G�r�n�m�"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "G�nderen"
@@ -10382,9 +11465,12 @@ msgstr "�letiler"
 msgid "With Category"
 msgstr "Kategori"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Giri�imli"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%d %B %A, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -10458,13 +11544,6 @@ msgstr "Toplant� _biti� saati:"
 msgid "All Attendees"
 msgstr "T�m Kat�l�mc�lar"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%d %B %A, %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "�_imdiki G�r�n�m"
@@ -10475,45 +11554,129 @@ 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PS�PCCP"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "�imdi"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Bug�n"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Tamam"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, 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
+#, fuzzy
+msgid "Baltic"
+msgstr "Temel"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "hafta"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "��p"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "�leti�im kurulamad�"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Haberler"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Bilinmeyen hata: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "�ntan�ml� karakter k�mesi: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Di�er"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "�leti�im D�zenleyici"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Aramay� Kaydet"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Geli�mi� Arama"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "T�m�n� G�ster"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Geli�mi�..."
 
@@ -10565,3 +11728,257 @@ msgstr "init_corba(): GNOME ba�lat�lamad�"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ba�lat�lamad�"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Tercihleri de�i�tir"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "G�rev Tercihleri..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Ba�lant�lar..."
+
+#~ msgid "_Company:"
+#~ msgstr "�_irket:"
+
+#~ msgid "(none)"
+#~ msgstr "(hi�biri)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplant� i�in uyar�"
+
+#, fuzzy
+#~ 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 "Settings..."
+#~ msgstr "Ayarlar..."
+
+#~ msgid "Percent complete"
+#~ msgstr "Biten y�zde"
+
+#~ msgid "Edit this task"
+#~ msgstr "Bu g�revi d�zenle"
+
+#~ msgid "Go to Today"
+#~ msgstr "Bug�ne Git"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "T�m Olu�umlar� Sil"
+
+#~ msgid "Summary contains"
+#~ msgstr "�zet i�eri�i"
+
+#~ msgid "Description contains"
+#~ msgstr "A��klama i�eri�i"
+
+#~ msgid "Comment contains"
+#~ msgstr "Yorum i�eri�i"
+
+#~ msgid "Has category"
+#~ msgstr "Kategori"
+
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now hi� arg�man istemiyor"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time 1 arg�man istiyor"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time i�in birinci arg�man bir dizi olmal�d�r."
+
+#~ 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"
+
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day 2 arg�man istiyor"
+
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr "time-add-day 2. arg�man� bir say� istiyor"
+
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin bir arg�man istiyor"
+
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr "time-day-begin birinci arg�man� time_t bi�iminde istiyor"
+
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "time-day-end bir arg�man istiyor"
+
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "time-day-end birinci arg�man� time_t bi�iminde istiyor"
+
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype hi� arg�man istemiyor"
+
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "ocrur-in-time-range? iki arg�man istiyor"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "contains? iki arg�man istiyor"
+
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? birinci arg�man� dizgi �eklinde istiyor"
+
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? ikinci arg�man� dizgi �eklinde istiyor"
+
+#~ msgid "has-categories? expects all arguments to be strings"
+#~ msgstr "has-categories? t�m arg�manlar� dizgi �eklinde istiyor"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP dizini taran�yor"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Adrese Y�nlendir"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm Takma �simleri"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adres Defterleri"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" bi�iminden \"%s\" bi�imine ge�"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Dizin yeniden yap�land�r�l�yor"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Ge�erli dizin kapat�l�yor"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Yeni dizinin ad� de�i�tiriliyor ve a��l�yor"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Yeni dizin yarat�l�yor"
+
+#~ msgid "Copying messages"
+#~ msgstr "�letiler kopyalan�yor"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution i�lemleri"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "%s dizini %s adresine ta��n�yor"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "%s dizini %s adresine kopyalan�yor"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "%d/%d ileti al�n�yor (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "%d/%d ileti kaydediliyor (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (y�nlendirilmi� ileti)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "�lt: (konusuz)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Y�nlendirilmi� ileti (konusuz)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Y�nlendirilmi� �leti-----<br><b>G�nderen:</b> %s<br><b>Al�c�:</b> "
+#~ "%s<br><b>Konu:</b> %s<br>"
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Metar indirirken bir hata olu�tu</b>"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution dosyalar� ba�ar�yla kuruldu."
+
+#~ msgid "5 Days"
+#~ msgstr "5 G�n"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Yeni bir takvim yarat"
+
+#~ msgid "Day"
+#~ msgstr "G�n"
+
+#~ msgid "Month"
+#~ msgstr "Ay"
+
+#~ msgid "New _Event"
+#~ msgstr "Yeni _Olay"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Takvimi A�"
+
+#~ msgid "Prev"
+#~ msgstr "Geri"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Takvimi farkl� kaydet"
+
+#~ msgid "Week"
+#~ msgstr "Hafta"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Takvimi A�"
+
+#~ msgid "Delete this group"
+#~ msgstr "Bu grubu sil"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Bu grubu kaydet ve pencereyi kapat"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "G_rubu ba�kas�na g�nder..."
+
+#~ msgid "Send _message to group..."
+#~ msgstr "�letiyi gruba g�nder..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Okunmu� Olarak ��aretle"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oku_nmam�� Olarak ��aretle"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "�letiyi yaz�c�ya g�nder"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Y�nlendir"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Di_zine kaydet..."
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Metin dosyas� ekle..."
+
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Bu dizinin �zelliklerini de�i�tir"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution �ubu�u _k�sayolu"
diff --git a/po/uk.po b/po/uk.po
index ec6674beee..622fbcf916 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-04-28 02:04-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\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,11 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "������: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +34,7 @@ msgstr ""
 "\n"
 "��'�: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,31 +42,31 @@ msgstr ""
 "\n"
 "  ���Ʀ��:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -65,7 +74,7 @@ msgstr ""
 "\n"
 "���� ����������: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -73,7 +82,7 @@ msgstr ""
 "\n"
 "������:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -81,13 +90,13 @@ msgstr ""
 "\n"
 "  ������� ��������: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -95,7 +104,7 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -103,7 +112,7 @@ msgstr ""
 "\n"
 "  �����:       "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -111,7 +120,7 @@ msgstr ""
 "\n"
 "  �ŭ���:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -119,7 +128,7 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -127,13 +136,13 @@ msgstr ""
 "\n"
 "  ������:      "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -141,7 +150,7 @@ msgstr ""
 "\n"
 "��������:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -149,7 +158,7 @@ msgstr ""
 "\n"
 "�������:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -157,7 +166,7 @@ msgstr ""
 "\n"
 "���������� �����:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -165,7 +174,7 @@ msgstr ""
 "\n"
 "���������� ������: "
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -173,7 +182,7 @@ msgstr ""
 "\n"
 "������� ��������: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -181,7 +190,7 @@ msgstr ""
 "\n"
 "������� ����: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -189,7 +198,7 @@ msgstr ""
 "\n"
 "������������: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -197,7 +206,7 @@ msgstr ""
 "\n"
 "������: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -205,7 +214,7 @@ msgstr ""
 "\n"
 "����Φ��æ�: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -213,31 +222,31 @@ msgstr ""
 "\n"
 "  ��'�:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -245,7 +254,7 @@ msgstr ""
 "\n"
 "������Ҧ�: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -263,13 +272,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -277,27 +286,25 @@ msgstr ""
 "\n"
 "���̦���� ����: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "����������� ��צ��������"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "���Ħ�� ������ ��� %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "�� ������� �Φæ�̦������ Bonobo"
 
@@ -310,14 +317,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "�� ������� ��������� ������ Wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "�� ������� ��������� Wombat"
 
@@ -326,723 +333,851 @@ msgstr "�� ������� ��������� Wombat"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "����� ������ϧ ����� Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "��������� Evolution ��� ������� ������Ԧ�."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "������ ��� ��� ��������� ������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "������ LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "����"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "��צ����� ��� ������ϧ �����"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "������"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "��צ����� ��� ��������æ�"
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "��������"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "�������"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "�����'����� ��� ������"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "����'����:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "�����Ʀ��æ�:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "�������� ����, ���� ���� �� ���դ."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "��������� ������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "������ ������� �����"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "��'�:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "����:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+msgid "Addressbook Sources"
+msgstr "������� ������ϧ �����"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "������"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "��'�:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr "������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "�����������"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "��ۦ ��������"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "���Ħ�� ������ ��� %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "�� ������� צ������ ������� �����"
+
+#: addressbook/gui/component/addressbook.c:380
+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:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+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:554
+msgid "Any field contains"
+msgstr "����-��� ���� ͦ�����"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "��'� ͦ�����"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "���������� ������ ͦ�����"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "��'� ͦ�����"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI ����, �� ���� צ��������� ������������"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "�������� �-�����"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "�-����� 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "�-����� 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "������� ����"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "�������� ����� �������"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "��������� ������� �����"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "����������� ��������ϧ �������æ�"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "������ �� ������Ԧ�"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "���������� ������:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "���������� ������"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "��������� ������ (����������!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "����� ������ϧ ����� Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "��������"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "�������� ���"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "��ۦ ��������"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "�������� ��צ��������"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "������� �����"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "����Ҧ�� ����� � ������:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "������Ҧ�:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "�����"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "������� ����:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "��'����..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "������Ҧ�..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "�������� ������Ԧ�"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "�������æ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "����� ��� ��������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "�������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "�Ҧ����æ�:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "���� �������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "�������� �-�����"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "���� ���������� ����� � HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "������ ���Ҧ��� WWW:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "������"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "������..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "��'� ��ͦ�����:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "���� ����������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "������:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "��������..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "���Ħ�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "����� ��'�..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "�������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "��'� ��Ҧ�����:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "��¦����� �������"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "�Ҧ�������:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "�Ʀ�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "�����Ӧ�:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "�� ������� ������"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "������ �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "��ͦ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "������ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "������� ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "�������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "������� 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "������ ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "��¦�����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "����� ����"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "�������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "���������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "��Ħ�"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "������"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "�-����� 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "�-����� 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "������ �������?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "������ ��������� ��������"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "����������� ������� ���Φ"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "����� ��'�"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "�-�����"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "������ _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "����צ��� ������"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "������:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "�����Ħ�"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "���"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "������:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "�����:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "�/�:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "����/�������:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "������:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "����צ���� ����� ��'�"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "������"
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "��������"
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "���դ"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "��'�:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "�Ҧ�����:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "��-������צ:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "�����:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "�� _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "���Ħ�� ������ ��� %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "�� ������� צ������ ������� �����"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "�������� ���"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "���������..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "����-��� ���� ͦ�����"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "��'� ͦ�����"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "���������� ������ ͦ�����"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "URI ����, �� ���� צ��������� ������������"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "������ LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "����"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "��צ����� ��� ������ϧ �����"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "������"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "��צ����� ��� ��������æ�"
-
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Base"
-msgstr "��������"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
+msgid "List _name:"
+msgstr "����� �����:"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Subtree"
-msgstr "�������"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "�����'����� ��� ������"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "����'����:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "�����Ʀ��æ�:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "�������� ����, ���� ���� �� ���դ."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "��������� ������� �����"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "������ ������� �����"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "��'�:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "����:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "������� ������ϧ �����"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "���������"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "��'�:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "��ۦ ��������"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "���������� ������"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "��������� ������ (����������!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "����������� ��������ϧ �������æ�"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "������ �� ������Ԧ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
+msgid "Members"
+msgstr "�����������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: 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 ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "����� ������ϧ ����� Evolution"
+msgid "_Remove"
+msgstr "��������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "��������� Evolution ��� ������� ������Ԧ�."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "�������� ������Ԧ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+msgid "Contact List Editor"
+msgstr "�������� ������Ԧ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+msgid "New Contact:"
+msgstr "����� �������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "������ ��� ��� ��������� ������� �����"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "��������"
+msgid "Original Contact:"
+msgstr "��ۦ ��������"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "�������� ���"
+#: 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?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "����� ������ϧ ����� Evolution"
+msgid "Changed Contact:"
+msgstr "��ۦ ��������"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "������..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "�������� ��צ��������"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "������� �����"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "����Ҧ�� ����� � ������:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "�����"
 
@@ -1154,159 +1289,255 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "�������� �� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "��Ħ����� ������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "��Ħ����� ��צ�������� �� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "����������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+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:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "������� ������������ %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "�������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "��צ���� �������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "�����������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "����� �� ��������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "�����æ� �� Ц�����դ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "���ͦ����"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "������� �����/������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "������� ������������ %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "������� ������������ %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "������� ������������ %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "������� ������������ %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "������� ���������� ����� �����: %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* ������ ��� ��� ������ ������� *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "�-�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "��������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "������� ��ͦ�����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "������ �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "����Φ��æ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "��¦����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "������¦����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "������� ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "������ ������� 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "����� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "���Ħ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "�Ʀ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "�����:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "�����Ӧ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "��Ҧ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "�Ҧ�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "���ͦ���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "�����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "������������ ���������..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "�������� � �����Φ� ���ڦ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1345,7 +1576,8 @@ msgid "Dimensions:"
 msgstr "���ͦ��:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "�����..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1405,7 +1637,6 @@ msgid "Margins"
 msgstr "����"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "���˦��� �������˦�:"
 
@@ -1486,40 +1717,67 @@ msgid "Width:"
 msgstr "������:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "�����..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "���"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "������"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "����� ��������� Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1529,141 +1787,254 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "������� ����Ҧަ"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "�������� �������æ� ��� Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "�������"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "���"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "��� ��� (� ��������)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "��������� ����Ҧ�"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "���"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "������"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "�� ������� �Φæ�̦������ GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "�� ������� �Φæ�̦������ Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "��������� �������� ���������� �������: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "����� �� ��������"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "�������� ��������"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "�������� ��������"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1572
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "�� ���������"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "�����դ����"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "���ͦ����"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 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:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1674,23 +2045,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1700,119 +2075,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�������� צ������ ��� ���� ͦ� 0 �� 100, �������"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "�����������"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "����'�����"
 
-#: calendar/gui/calendar-model.c:1582
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1582
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "�"
 
-#: calendar/gui/calendar-summary.c:198
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 #, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d %B %Y"
+msgid "Day View"
+msgstr "������: "
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "����Ҧަ"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "������� �������"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "�������"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "��������"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "������"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>������� ������������ ���������</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, ���� צ��������� ��������"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>������� ������������ ���������:<br>����� �� Ц�����դ����"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "�����צ �ɭ����"
 
-#: calendar/gui/calendar-summary.c:622
+#: calendar/gui/dialogs/alarm-options.c:363
 #, fuzzy
-msgid "Display"
-msgstr "����"
+msgid "Message Alarm Options"
+msgstr "�������� ��צ��������"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "�������� ����Ҧަ"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "��������� צ����������"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "�������� ��������"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "������������ ���������"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, ���� צ��������� ��������"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "��������� ��צ��������"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "��������� ��������"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "�������"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#, fuzzy
+msgid "days"
+msgstr "����"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "��������� ����Ҧ�"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "��� ��� (� ��������)"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "����"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 ����"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "�������"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "�������� 1 �������"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "24 ������"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 ������"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d ������"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 ������"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "��Ħ�����"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 �������"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "������� ��צ��������"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "��Ħ����� �����"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "��������� ��������"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " ����� �������� ����Ҧަ"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " Ц��� ������� ����Ҧަ"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " ����� ˦���� ����Ҧަ"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " Ц��� ˦��� ����Ҧަ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "��������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "���� � ���"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "�����������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "��������:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "���������"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "���"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "�����"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#, fuzzy
+msgid "day(s)"
+msgstr "����"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "˦���� ����Ҧަ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "�������"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "������� ����Ҧަ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1843,36 +2394,36 @@ msgid "60 minutes"
 msgstr "60 ������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "�����צ �ɭ����"
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "��������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "��������� ���������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "��������"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "��������� ���������"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "�������"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1881,595 +2432,1094 @@ msgid "Defaults"
 msgstr "�������æ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "��������� צ����������"
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Display"
+msgstr "����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "����� ���:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "������ ���� �����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "�'������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "���צ���"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "����Ħ���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "��¦� �������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "�Ҧ������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "���������� ��� �Ӧ ����Ҧަ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "�����������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "��������"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "�������� ��� ���������� ����Ҧ���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "�������� ������ ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "������� ���:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "��Ħ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "������ �������"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "�����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "���Ħ����ަ ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "������ ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"������� ����: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "�������Φ �ɭ����"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "������� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
 #, fuzzy
-msgid "seconds."
-msgstr "��Ħ�����"
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "�� ������Φ, �� ������ ������ ��������"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "�� ������Φ, �� ������ ������ ����� � �����̦ \"%s\"?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "���������"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "���������"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "��������� ����Ҧ�"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "����Ҧ� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "�������� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "���������� ����� - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "����� ��������"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "���������� ����?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"���� � æ�� ������ ��� ���դ.\n"
+"���������� ����?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "Save As..."
+msgstr "�������� ��..."
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�� ������Φ, �� ������ ������ ����Ҧ� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�� ������Φ, �� ������ ������ �� ��������� ����Ҧ�?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�� ������Φ, �� ������ ������ �� ��������� ��������?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�� ������Φ, �� ������ ������ ����� � �����̦ \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�� ������Φ, �� ������ ������ ��� ���������� ����� � �����̦?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "�� ������ �ͦ���� �ͦ��?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "�� ������Φ, �� ������ ������ ����Ҧ� \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "��������� ��������"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "����� ��������"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "�� ������Φ, �� ������ ������ ����� � �����̦ \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "����Ҧ� - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "������� ����"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "�������� - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "���Ħ��:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "���������� ����� - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"������� ����: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ����������:"
+#: calendar/gui/dialogs/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"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "����Ҧ�"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "�����������"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "����������"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "��������� ����Ҧ�"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "�����Ʀ��æ�"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "���� � ���"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "���� ���������:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "��������"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "������"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "���̦���"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "��� �������:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "��������:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "��������"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "��� ����������:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "���� �������:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "��������..."
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "����� �����:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "_Due Date:"
-msgstr "���Ħ�:"
+msgid "Resource"
+msgstr "������� ������:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "�Ҧ������:"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "����:"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "������Ҧ�"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "���Ҧ�Φ ����"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "������ Ħ�"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "������"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "������"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "�����դ����"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "������¦����� �������"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "���Ҧ�Φ ����"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "���Ҧ�Φ ����"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "���Ҧ�Φ ����"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "��Ħ�����"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "������..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "���� �����צ�"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "���� ����������"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "���� ˦���"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "���� �������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "������Ʀ��� ���������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "��Ҧ����"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "�������� ���������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "��������"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "�����Ҧ���"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "��¦�����"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "�ɭ����"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+#, fuzzy
+msgid "Type"
+msgstr "���:"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "������ ��� ��� ������ ��������"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "���������:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "���������:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "��������� �����..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "���������:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+#, fuzzy
+msgid "on"
+msgstr "���"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "����"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+#, fuzzy
+msgid "on the"
+msgstr "ͦ����"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+#, fuzzy
+msgid "occurrences"
+msgstr "�������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "��� ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "�����"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "����������"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "��� ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "��������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "������� ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "������ ����������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "�ͦ����"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "�"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "������"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "ͦ����"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#, fuzzy
+msgid "week(s)"
+msgstr "�������"
+
+#: 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
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "���� ���������:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "�����"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "��������"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% ����������:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "������"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "��� �������:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+#, fuzzy
+msgid "_Due Date:"
+msgstr "���Ħ�:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "�Ҧ������:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "����:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "��������� �� ��������"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "��������� �������� �� ��������"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 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:557
-msgid "Edit this task..."
-msgstr "��������� �� ��������..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "��������� ��������"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "��������� �� ��������"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "������ �� ��������"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "��������� �� ��������"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "������ ��������"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "��"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "������ ��� ��� ������ ��������"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "��"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ����������:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "�ɭ����"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "������Ҧ�"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "% ����������:"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "���� ����������"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "���� ˦���"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "������Ʀ��� ���������"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "�Ҧ������"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "���� �������"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "��������"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "��������"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "�����Ҧ���"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, 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:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-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:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "��"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "��"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "���� ����Ҧ�"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "���� ������� ��Ħ�"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "������Φ"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "������ ����"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "��������"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "������ �� ����Ҧ�"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "���������� ����Ҧަ"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "�������� �������� ����"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "������ ��� �������"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "������ �������"
+msgid "Delete _All Occurrences"
+msgstr "�������"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "�� ������� �������� ��� ����������� ����!\n"
-
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "����� Evolution ����� �����������."
+msgid "This is a meeting request."
+msgstr "�� ������� ������"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "I couldn't read your calendar file!\n"
-msgstr "�� ������� �������� �������� � \"%s\""
+msgid "The message is not understandable."
+msgstr "��צ�������� %s �� ��������."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-#, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "�� ������� �������� �������� � \"%s\""
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Component successfully deleted."
-msgstr "����� Evolution ����� �����������."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-#, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "������ �� ���������"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "����� ���� ���������� ڦ�������."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "�������� ��������"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "�� ������� �������� ��� ����������� ����!\n"
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "��������� ����Ҧ�"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "�� ������� �������� �������� � \"%s\""
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2484,26 +3534,22 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "���������� ��צ��������"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "����:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "������������ ���������"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "������������ ���������..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "���������:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "�������� ��צ��������:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "��������:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr ""
@@ -2512,452 +3558,50 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "���� �����צ�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "���� �����צ�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "���� �����צ�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"���������\n"
-"����Ҧ�"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "��� ������� ڦ������:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "�Ҧ����æ�:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "���������� ����Ҧަ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "���Ҧ�Φ ����"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-#, fuzzy
-msgid "Role"
-msgstr "��¦�����"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "���������� ����Ҧަ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
-msgid "Status"
-msgstr "����"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "������Ҧ�:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�� ������� ����������� �������� � \"%s\""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "�����, ����Ȧ���� ��� ������������ \"%s\", �� Ц�����դ����"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "��������� ����Ҧ�"
-
-#: calendar/gui/event-editor.c:454
-#, fuzzy
-msgid "on"
-msgstr "���"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "����"
-
-#: calendar/gui/event-editor.c:606
-#, fuzzy
-msgid "on the"
-msgstr "ͦ����"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:759
-#, fuzzy
-msgid "occurrences"
-msgstr "�������"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1548
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "����"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 ����"
-
-#: calendar/gui/event-editor.c:1553
-#, fuzzy, c-format
-msgid " %d weeks"
-msgstr "�������"
-
-#: calendar/gui/event-editor.c:1555
-#, fuzzy
-msgid " 1 week"
-msgstr "�������� 1 �������"
-
-#: calendar/gui/event-editor.c:1558
-#, fuzzy, c-format
-msgid " %d hours"
-msgstr "24 ������"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 ������"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d ������"
-
-#: calendar/gui/event-editor.c:1565
-#, fuzzy
-msgid " 1 minute"
-msgstr "10 ������"
-
-#: calendar/gui/event-editor.c:1568
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "��Ħ�����"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 �������"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "�������� Ħ����"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "��Ħ����� �����"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "��������� ��������"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " ����� �������� ����Ҧަ"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " Ц��� ������� ����Ҧަ"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " ����� ˦���� ����Ҧަ"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " Ц��� ˦��� ����Ҧަ"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "����Ҧ�"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "������� ����Ҧަ"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "��� ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "�����"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "�ͦ����"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "��� ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "��������"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "������� ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "�����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "���������..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "������ ����������"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "��� ����������:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "���� �������:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "���� �������:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "���"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "�����"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-#, fuzzy
-msgid "day(s)"
-msgstr "����"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "˦���� ����Ҧަ"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "�"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-#, fuzzy
-msgid "hour(s)"
-msgstr "������"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-#, fuzzy
-msgid "minute(s)"
-msgstr "�������"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "ͦ����"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "������� ����Ҧަ"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-#, fuzzy
-msgid "week(s)"
-msgstr "�������"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "Ҧ�"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "���� ����Ҧ�..."
-
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-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/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "�������� ��� "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "�������� ͦ�����"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "���� ͦ�����"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "�������� ͦ�����"
-
-#: calendar/gui/gnome-cal.c:240
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Has category"
-msgstr ""
-"\n"
-"������Ҧ�: "
+msgid "New _Appointment..."
+msgstr "���� ����Ҧ�..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "�� ������� צ������ ���� \"%s\":\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "�����, ����Ȧ���� ��� ������������ \"%s\", �� Ц�����դ����"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "����� ��������� Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -2980,236 +3624,259 @@ msgid "Go To Date"
 msgstr "������ ����"
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "Go To Today"
-msgstr "������Φ"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "March"
 msgstr "�����"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "����Ħ���"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "October"
 msgstr "����"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "������Φ"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "���"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "���"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "��������"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "�������� ���� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "�������� ������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "�������� ͦ���� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "�������� Ҧ� (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "����������� ��������"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "�������� �����"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "����������� ��� �������"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "��������� �����"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ���� צ��������� ��������"
@@ -3246,90 +3913,109 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "�������"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "�����æ� �� Ц�����դ����"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "������Φ��æ� \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�� ������� צ������ ������� �����"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "����� ��צ�������� %d � %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "��������� ��צ�������� %s"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "��������� �������� ��צ��������: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "������Φ��æ� \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "% ����������:"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "����� ��צ�������� %d � %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "����� ��צ�������� %d � %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������� ���������� �����: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������� ���������� �����: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������� ���������� �����: %s"
@@ -3365,14 +4051,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "�� ������� �������� �����: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "�� ������� �������� ����: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, 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-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ������� �������� ���� ���������� ��� %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3387,113 +4092,108 @@ msgstr "�� ������� ������� ���������� �� ��������� fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "�� ������� ������� ���������� �� ��������� flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "�������� ����� ��������"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "�� ������� צ������ ���� ����� %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "�� ������� צ������ ���������� ���� ����� %s: %s"
 
-#: camel/camel-movemail.c:199
-#, fuzzy, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "�������� ����� ��������"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "������� ���������� ����� �����: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "������� ������ ����� � ���������� ����: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "�� ������� �������� ����� � ����������� ���̦ %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "�� ������� �������� �����: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "�� ������� ��������� �����Ϥ���� ������: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(��צ���� �������)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "������� ���������� ����� �����: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "������� ������ ����� � ���������� ����: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "������� ������ ����� � ���������� ����: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "���Ħ�� ������ NNTP ��� %s@%s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "�� ������� ������."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "��������� �������� ����� �� GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "�� ������� �������� ���������� ����: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3512,39 +4212,39 @@ msgstr "�� ������� ����������� %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "�� ������� ����������� %s: ����� �Φæ�̦��æ� � ����̦."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "������:"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "���ͦ����"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(��צ����� ����)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "�������� ��������"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "������ צ������ ��'� �����������"
@@ -3643,7 +4343,7 @@ msgid ""
 msgstr "�� ������� �������� �����: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:421
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "���ަ������ צ���צ�� צ� ������� IMAP: %s"
@@ -3701,20 +4401,20 @@ msgstr ""
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3723,27 +4423,53 @@ msgstr ""
 "�� ������� �������� ������� %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "���Ħ�� ������ NNTP ��� %s@%s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "����� ����� �� ���դ."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "����� ����� �� ���դ."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "�� ������� צĦ����� ��'� ����������� �� ������"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "��������"
+msgid "Failed to decode message."
+msgstr "��������� ��צ�������� %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3753,6 +4479,18 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
 #: camel/camel-url.c:289
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
@@ -3760,12 +4498,12 @@ msgstr ""
 "�� ������� צ������ ���� \"%s\":\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "��������� �� ��צ��������"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "��������� �� ��צ��������"
@@ -3777,60 +4515,75 @@ msgstr ""
 "��������� �������� ��צ�������� \"%s\" � ���� \"%s\"\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "�� ������� �������� ������� %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "���ަ������ צ���צ�� צ� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "��צ���� �������"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "���ަ������ צ���צ�� OK צ� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "�� ������� �������� ������� %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:275
+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:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "���������� ��� � \"%s\""
+msgid "Scanning for changed messages"
+msgstr "���������� ��צ�������"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "���������� ��צ�������"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "�� ������� �������� ������� %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3839,7 +4592,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "�������� ��צ�������� � �����Φ� ��æ"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "����"
 
@@ -3873,28 +4626,28 @@ msgstr "��� ���������� �� ���������� ����� �� �������� IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:444
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:454
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "������Ʀ��æ� �� �����������"
 
-#: camel/providers/imap/camel-imap-store.c:479
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:494
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:522
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3902,103 +4655,107 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "�������� ������� ����"
-
-#: camel/providers/imap/camel-imap-store.c:883
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "�� ������� �������� ������� %s: %s"
+msgid "No such folder %s"
+msgstr "��צ��� ���� \"%s\"."
 
-#: camel/providers/imap/camel-imap-store.c:1386
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "������� �� Maildir"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "\"%s\" �� � ��������� ������."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "���� �������ϧ ����� %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ������� ������������� ���� \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ������� ������ ���� \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ������� ������ ���� \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "��Ħ���Φ ��צ��������"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4007,19 +4764,20 @@ msgstr ""
 "��������� �������� ��צ��������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "��������� �� ��צ��������"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4029,14 +4787,14 @@ msgstr ""
 "�� ������� צ������ ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "���� \"%s\" �� ���դ."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4046,22 +4804,29 @@ msgstr ""
 "�� ������� �������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" �� � ��������� Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ������� ������ ���� \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "������� �� Maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"�� ������� �������� ���� \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4069,11 +4834,13 @@ 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:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ������� �������� ����: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "��������� צ������ ������� ��������: %s: %s\n"
@@ -4083,9 +4850,12 @@ msgstr "��������� צ������ ������� ��������: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "��������� ������ ��צ�������� �� ����� Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4094,11 +4864,13 @@ msgstr ""
 "��������� �������� ��צ�������� \"%s\" � ���� \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "����� ���� ���������� ڦ�������."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4144,11 +4916,13 @@ 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-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "������Φ��æ� \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
@@ -4156,23 +4930,29 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, 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
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "�� ������� ������������� ���� \"%s\": %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "������Φ��æ� \"%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-spool-summary.c:936
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
@@ -4180,6 +4960,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ������� צ������ ��������� ������� ��������: %s"
@@ -4188,21 +4969,28 @@ msgstr "�� ������� צ������ ��������� ������� ��������: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������� ������ � ��������� ����� ��������: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�¦� ������ � ��������� ������� ��������: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -4217,13 +5005,14 @@ msgstr "�� ������� ������� ��������� ����: %s"
 msgid "Could not rename folder: %s"
 msgstr "�� ������� ������������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "��צ���� �������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "��Ħ���Φ ��צ��������"
@@ -4238,39 +5027,92 @@ msgstr "\"%s\" �� � ���������."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "��������� צ������ ������� ��������: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "��������� ������ ��צ�������� �� ����� Mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "\"%s\" �� � ��������� ������."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "���� \"%s\" �� ���դ."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "���� �������ϧ ����� %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "�� ������� צ������ ���������� ���� ����� %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "�� ������� ������ ���� \"%s\": %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "���Ħ�� ������ NNTP ��� %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "������ צ������ ��'� �����������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "�� ������� צĦ����� ��'� ����������� �� ������"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "������ צ������ ��'� ����������� � ������"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "��צ�������� %s �� ��������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "�� ������� �������� ���� ���� � �������."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "�� ������� ����������� ������ ���� ��� %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "�� ������� �������� ������ ���� ��� %s: %s"
@@ -4283,24 +5125,24 @@ msgstr "������ USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "�� ������� צ������ ������� ������� �����: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "������ USENET ����� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4354,7 +5196,7 @@ msgstr "�� �������� ��צ�������� � �������"
 msgid "Delete after %s day(s)"
 msgstr "������ ��������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4382,59 +5224,59 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "�������� ����� ��������"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "�������� ����� ��������"
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 #, fuzzy
 msgid "(Unknown)"
 msgstr "��צ���� �������"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��צ��� ���� \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4487,7 +5329,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "���������� ����� ����� �������� sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4495,127 +5337,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "����������� ��צ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "�� ������� ������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "������Ʀ��æ� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "������Ʀ��æ� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "���Ħ�� ������ NNTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4623,312 +5465,237 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "������ SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "���������� ����� SMTP ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "��������� צĦ����� ��צ��������: ������ צ��������� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "��������� צĦ����� ��צ��������: ������ צ��������� �� צ���."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "������ �� ��צ�������� �������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "���������� ��� �ަ������� צ���צĦ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������� צ���צĦ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "�����Ʀ��æ�"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "���������� ��� �ަ������� צ���צĦ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "���������� ��� �ަ������� צ���צĦ �� HELO: %s: �� ��������"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "���ަ������ צ���צ�� צ� ������� IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "�������� ����� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "�������� ����� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "�������� ����� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "��צ���� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u ���Ԧ�"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f�"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1f�"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1f�"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "���������"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "�������� ����"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "�������� �����Φ �������� � ������ ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "��������..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "�������� ���� �� ��צ��������"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
-#, fuzzy
-msgid "Attachment"
-msgstr "���������"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "���������Ԧ ���������"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "����� �����:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "���������"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "��� MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "��Ħ����� \"%s\""
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"�� ������� צ������ ���� Ц����� %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:699
-msgid "Save as..."
-msgstr "�������� ��..."
-
-#: composer/e-msg-composer.c:710
-#, c-format
-msgid "Error saving file: %s"
-msgstr "������� ���������� �����: %s"
-
-#: composer/e-msg-composer.c:730
-#, c-format
-msgid "Error loading file: %s"
-msgstr "������� ������������ �����: %s"
-
-#: composer/e-msg-composer.c:802
-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:860 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:866
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:891
-msgid "Open file"
-msgstr "�������� ����"
-
-#: composer/e-msg-composer.c:1017
-msgid "That file does not exist."
-msgstr "����� ����� �� ���դ."
-
-#: composer/e-msg-composer.c:1027
-msgid "That is not a regular file."
-msgstr "�� �� ��������� ����."
-
-#: composer/e-msg-composer.c:1037
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:1047
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:1090
-msgid "An error occurred while reading the file."
-msgstr "������� ������� � ��� ���������� �����."
-
-#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
-msgid "Compose a message"
-msgstr "���������� ��צ��������"
-
-#: composer/e-msg-composer.c:1825
-msgid "Could not create composer window."
-msgstr "�� ������� �������� צ��� ������������."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "������ ��� ��� ��������� ������� �����"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "�����צ���� ��:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "���Ħ�� ������Ԧ� ��צ��������"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "���Ħ�� ������Ԧ�, �� ��������� ��Ц� ��צ��������"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4936,349 +5703,285 @@ msgstr ""
 "���Ħ�� ������Ԧ�, �� ��������� ��Ц� ��צ�������� �� ������� � ������ "
 "��������ަ�."
 
-#: composer/evolution-composer.c:355
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:370
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "�� ������� �Φæ�̦������ �������� Evolutuion."
-
-#: data/evolution.desktop.in.h:2
-#, fuzzy
-msgid "The Evolution groupware suite"
-msgstr "Evolution - %s"
-
-#: data/evolution.keys.in.h:1
-#, fuzzy
-msgid "address card"
-msgstr "������"
-
-#: data/evolution.keys.in.h:2
-#, fuzzy
-msgid "calendar information"
-msgstr "����� �������æ�"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-#, fuzzy
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-#, fuzzy
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "�������� ����"
 
-#: executive-summary/component/e-summary.c:924
+#: composer/e-msg-composer.c:670
 #, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"��������� צ������ ���� %s:\n"
+"�� ������� צ������ ���� \"%s\":\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:938
+#: composer/e-msg-composer.c:683
 #, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Error while reading file %s:\n"
 "%s"
-msgstr "������� ���������� ����� �����: %s"
+msgstr "������� ������������ �����: %s"
 
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "�������� ��..."
 
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "������������"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
+#: composer/e-msg-composer.c:906
 #, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "��������� ����� � %s"
+msgid "Error saving file: %s"
+msgstr "������� ���������� �����: %s"
 
-#: executive-summary/component/e-summary-url.c:72
+#: composer/e-msg-composer.c:926
 #, c-format
-msgid "Change the view to %s"
-msgstr ""
+msgid "Error loading file: %s"
+msgstr "������� ������������ �����: %s"
 
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "�������"
-
-#: executive-summary/component/e-summary-url.c:76
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "��������� � ����"
+msgid "Error accessing file: %s"
+msgstr "������� ���������� �����: %s"
 
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:78
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "������� �� ������������ ��������"
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
-#: executive-summary/component/e-summary-url.c:79
+#: composer/e-msg-composer.c:1067
 #, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "������� �� ���������� ��������"
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
-#: executive-summary/component/e-summary-url.c:80
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
-msgid "Configure %s"
-msgstr "���Ʀ�������� ����"
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "������� ���������� �����: %s"
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: executive-summary/component/main.c:62
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "�������� ����"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "�������� ��������� ����..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "���������� ��צ��������"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "�� ������� �������� צ��� ������������."
+
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#: composer/evolution-composer.c:374
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "�� ������� �Φæ�̦������ �������� Evolutuion."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#: data/evolution.desktop.in.h:2
 #, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+msgid "The Evolution groupware suite"
+msgstr "Evolution - %s"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "������"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#: data/evolution.keys.in.h:2
 #, fuzzy
-msgid "RDF Summary"
-msgstr "��Ħ��"
+msgid "calendar information"
+msgstr "����� �������æ�"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 #, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 #, fuzzy
-msgid "Factory for the test component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
+#: e-util/e-time-utils.c:240
 #, fuzzy
-msgid "Error"
-msgstr "��� �������"
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%I:%M %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "Ҧ�"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "���������"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "ͦ����"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "������"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "�������"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "�������"
 
-#: filter/filter-datespec.c:81
-#, fuzzy
-msgid "days"
-msgstr "����"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "������"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "�������"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "�������"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr "��Ħ�����"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: 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"
@@ -5286,28 +5989,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "�����"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<������ ��� ��� ������ ����>"
 
@@ -5330,8 +6041,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "��¦� ����"
 
@@ -5343,6 +6054,66 @@ msgstr "���Ħ�� URI ����"
 msgid "<click here to select a folder>"
 msgstr "<������ ��� ��� ������ ����>"
 
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"������� � �ŭ�������� ����ڦ \"%s\":\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "����"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "����� �������: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:648
+msgid "If"
+msgstr "����"
+
+#: filter/filter-rule.c:666
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:670
+msgid "if all criteria are met"
+msgstr "���� �Ӧ צ���צ�Ϥ �Ӧ� �����Ҧ��"
+
+#: filter/filter-rule.c:675
+msgid "if any criteria are met"
+msgstr "���� צ���צ��� ����-����� �����Ҧ�"
+
+#: filter/filter-rule.c:686
+msgid "Add criterion"
+msgstr "������ �����Ҧ�"
+
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "������"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "���������"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "����������� צ���Ҧ�"
@@ -5386,58 +6157,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr "�������� ���� ����"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"������� � �ŭ�������� ����ڦ \"%s\":\n"
-"%s"
-
-#: filter/filter-part.c:488
-msgid "Test"
-msgstr "����"
-
-#: filter/filter-rule.c:626
-msgid "Rule name: "
-msgstr "����� �������: "
-
-#: filter/filter-rule.c:630
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:646
-msgid "If"
-msgstr "����"
-
-#: filter/filter-rule.c:664
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:668
-msgid "if all criteria are met"
-msgstr "���� �Ӧ צ���צ�Ϥ �Ӧ� �����Ҧ��"
-
-#: filter/filter-rule.c:673
-msgid "if any criteria are met"
-msgstr "���� צ���צ��� ����-����� �����Ҧ�"
-
-#: filter/filter-rule.c:684
-msgid "Add criterion"
-msgstr "������ �����Ҧ�"
-
-#: filter/filter-rule.c:770
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:770
-msgid "outgoing"
-msgstr ""
-
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "����'�����"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5515,95 +6238,96 @@ msgid "Expression"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "��������� �� ������"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "¦����"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "������ �������� %s"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "���� ��צ��������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "��������� ��צ��������"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "��צ�������� ���� ��������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "��צ�������� ���� צĦ�����"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "��������� � ����"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "on or after"
 msgstr "������ ����"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "�����צ��� �Ӧ�"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 #, fuzzy
 msgid "Score"
 msgstr "��¦�����"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "����:"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "���ͦ�"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "����� ��"
@@ -5625,7 +6349,8 @@ msgstr "����������� ��"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
 
@@ -5657,201 +6382,280 @@ msgstr "����������� ������� ���Φ"
 msgid "Score Rules"
 msgstr "��¦�����"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "������"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "�-�����"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "�-�����"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "������ ������� �����"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "���������..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: 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:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "�������� �-�����"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "���Ʀ����æ� �����"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "���������Ԧ..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "�ͦ���� ���������Ԧ æ�� ����"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:253
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "���������Ԧ"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "���������Ԧ"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "��������� �������� ���������� �������: %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "��¦� ����"
 
-#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "���������� ���� ����"
 
-#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "���������� ���� צ���������"
 
-#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "���������� ���� ��������ަ�"
 
-#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "����� ������ ��������"
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "����� ����"
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "����� צ���������"
 
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "����� ��������ަ�"
 
-#: mail/folder-browser.c:585
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "����� ������ ��������"
 
-#: mail/folder-browser.c:594
-msgid "_Open"
-msgstr "��������"
-
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "�������� ��..."
 
-#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "���������"
 
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "�����צ��� צ���������"
 
-#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "�����צ��� �Ӧ�"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "�����צ��� �Ӧ�"
 
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:611
-#, fuzzy
-msgid "Forward _inline"
-msgstr "���������"
-
-#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "��������� ����������"
 
-#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "��������� ������������"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "�������"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "��������� ������������"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "��������� � ����..."
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "�������� � ����..."
 
-#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "���������"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "������ ������� �����"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "����������� Ʀ�����"
 
-#: mail/folder-browser.c:641
+#: mail/folder-browser.c:1322
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "�������� ������� � ��צ��������"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "����� ������ ��������"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:1480
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "����� ������ ��������"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "����� ������ �������� (%s)"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "����� ������ �������� (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, fuzzy, c-format
-msgid "Properties for \"%s\""
-msgstr "���������Ԧ"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "���������Ԧ"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/elm-importer.c:430
-#, fuzzy
-msgid "Elm mail"
-msgstr "�-�����"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -5869,23 +6673,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:395
-#, fuzzy
-msgid "Pine mail"
-msgstr "�������� �-�����"
-
 #: mail/local-config.glade.h:1
 #, fuzzy
 msgid "Current store format:"
@@ -5921,41 +6708,68 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: 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 ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "�������æ� Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "�������æ� Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "���� �����:"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "������"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ������Φ, �� ������ ������ ��������"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "���������"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "�� ������Φ, �� ������ ������ ����Ҧ�"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
@@ -6014,99 +6828,101 @@ msgid ""
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"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:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "��������� ��צ��������:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "��Ħ���Φ ��צ��������"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "��Ħ���Φ ��צ��������"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
+
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "��צ�������� ���� ��������"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "���������� ����?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"���� � æ�� ������ ��� ���դ.\n"
-"���������� ����?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "�������� ��צ�������� ��..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "�������� ��צ�������� ��..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "������� ������������ �����: %s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "������..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "����������� ��צ��������"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "�� ������� ����������� ��צ��������"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������Φ, �� ������ ������ ����Ҧ�"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "�'������� � ��������..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6138,10 +6954,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "�'������� � ��������..."
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Check for supported types "
@@ -6152,37 +6972,67 @@ msgid " color"
 msgstr " ��̦�"
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "���������� ������ ͦ�����"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "����� �������æ�"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "���������� ������ ͦ�����"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "���������"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "�����Ʀ��æ�"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "��� �����Ʀ��æ�: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "����������"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6192,362 +7042,563 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "������"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "��������� ���ϧ ����"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "���������"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "���������� ������:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "����� ��'�:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "���� �����:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "��������"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "���Ʀ����æ� �����"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "������"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "�������� ��צ�������� � �����Φ� ��æ"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "������ LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "����� �������æ�"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "�Ҧ����æ�:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "���������� PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "��¦� �������"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "��������� צĦ����� ��צ��������: �� ��������� ��������ަ�"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "���ͦ���"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "����� �������æ�"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "��Ħ����� ����� � �����Ԧ HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "��Ħ�����"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "��Ħ����� ��צ�������� �������"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "��Ħ����� ��צ�������� Ц�Φ��"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "���Ʀ����æ� �����"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "������:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "���� �����:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "����� �������æ�"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "��������Φ ����"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Type"
-msgstr "���:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "����� �����������:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "�����������"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "��Ħ�����"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "�������� ����� ��������"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "�������� ����� ��������"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "�� ������� �������� צ��� ������������."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"�� ������� �������� ������� %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "�� ������� �������� צ��� ������������."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "�� ������� �������� צ��� ������������."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "�������� ���������"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "��������� �������� ���������� �������: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "�������� �� ����..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "�������� � %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr ""
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "�������� � %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "��������"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Open link in browser"
+msgid "Loading message content"
+msgstr "����������� ��צ������� \"%s\""
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "�������� � ������ צ�Φ"
 
-#: mail/mail-display.c:1109
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "�������"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "��������"
 
-#: mail/mail-display.c:1111
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "�������"
+msgid "Save Image as..."
+msgstr "�������� ��..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "��Ħ�����"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "���������"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:771
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "����������� ��צ������� \"%s\""
+msgid "Date"
+msgstr "���"
 
-#: mail/mail-format.c:1071
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "���������� ������:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "���"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "�����צ���� ��:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "��"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "�������� GPG/PGP �� �������."
 
-#: mail/mail-format.c:1086
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1092
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "����������� ��צ��������"
 
-#: mail/mail-format.c:1093
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1183 mail/mail-format.c:1571
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1191 mail/mail-format.c:1579
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1792
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1804
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1808
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "��צ��� ���� \"%s\"."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "�������� � %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:814
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "���Ʀ�������� ����"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "���������� ������ϧ ����"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "�������������� ����ϧ ���� �� צ���������"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "��������� ���ϧ ����"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "��Ц������ ��צ�������"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+"��������� �������� ��צ�������� \"%s\" � ���� \"%s\"\n"
+"  %s"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "���Ʀ�������� ����"
+
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6556,382 +7607,342 @@ msgstr ""
 "������� � ��� \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr "������� ������������ �����: %s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "�����������"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:874
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "���������� \"%s\""
 
-#: mail/mail-ops.c:603
-#, fuzzy
-msgid "Sending message"
-msgstr "������ �� ��צ�������� �������"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "����� ��צ�������� %d � %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "�������� ��צ�������� � �����Φ� ��æ"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "% ����������:"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "���������� ��צ������� � ���� \"%s\""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "��Ħ���Φ ��צ��������"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "��Ц������ ��צ�������"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "�����������"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "��������"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "���������� ��� � \"%s\""
 
-#: mail/mail-ops.c:1152
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "��������"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "�������Φ ��צ��������"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "����������� ���� %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "����������� ���� %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "���Ʀ�������� ����"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "����������� ����"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��צ�������� %s"
 
-#: mail/mail-ops.c:1563
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "��������� ��צ��������"
 
-#: mail/mail-ops.c:1573
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "��������� ��צ�������� %d � %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1647
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "���������� ��צ�������"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
-#: mail/mail-ops.c:1739
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "�������� ��צ�������� � �����Φ� ��æ"
-
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "������� ���������� �����: %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "�� ������� �������� ������ ���� ��� %s: %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ������� �������� ��Φ: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "�����"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(��������������)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "����������� ��צ��������"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "��������� ��צ��������"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:284
 #, fuzzy
-msgid "Cancelling ..."
+msgid "Find in Message"
+msgstr "��������� ��צ��������"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "���������"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "������"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "����:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "���ͦ����"
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "���������"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "���������..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "�ަ�������..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "����������"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "���ͦ����."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-summary.c:468
-#, fuzzy
-msgid "Mail Summary"
-msgstr "��Ħ��"
-
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�� ������� �������� ��������� ������� �������� \"%s\": %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (��������� ��צ��������)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (��� ����)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��������� ��צ�������� %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "��������� ��צ�������� (��� ����)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "�������Φ ��צ��������"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "�������Φ ��צ��������"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "��������Φ ����"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "���� צ�������� ����"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "�����צ���"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "�����צ��� צ��������� ����� ��צ��������"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "�����צ��� �Ӧ�"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "�����צ��� �Ӧ� ����������� ����� ��צ��������"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "���������"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "��������� �� ��צ��������"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "����������� ������� ��צ��������"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "������ �� ��צ��������"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "�������Τ"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "�������Τ ��צ��������"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "��̦"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "�������� ��צ��������"
-
-#: mail/message-list.c:678
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:679
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "�� ������� צĦ����� ��צ��������: %s"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "����������� ��צ��������"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "�������"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "�������"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "�������"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "�������"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:884
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:970
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "���������� ��צ�������"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1083
-msgid "From"
-msgstr "���"
-
-#: mail/message-list.c:1083
-#, fuzzy
-msgid "Date"
-msgstr "���"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "���� ���������"
 
-#: mail/message-list.c:1084
-msgid "To"
-msgstr "��"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "���ͦ�"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "����"
 
@@ -6960,42 +7971,1468 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "���ͦ���� ���������� �� ���� \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "��������� ������������"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "����Ҧަ"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "�������� ����Ҧަ"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "��Ħ��"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "�������æ� Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>������� ������������ ���������</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "�������� ��������"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "���Ħ��:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %d %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "�� ������� ����������� ��צ��������"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): �� ������� �Φæ�̦������ Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "��������"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "���ͦ���"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "�������:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "�����"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "�������"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "ͦ����"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "�������"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "����"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "�������"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "��������"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "��Ħ�"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "���� ͦ�����"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "������ ��̦"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "�����"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "���� ͦ�����"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "�-�����"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "�������� ��� "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "�������� �-�����"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Sendmail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "�������� ��� "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "�������� ��� "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "�����Ʀ��æ�:"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "��צ���� �������"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "��� ������� ڦ������:"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "���դ"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "������"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "������ �������� %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "�������� ��� "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "������� �� צ���"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "��¦�����"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "�������� ��������"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "������� �� צ���"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "����������"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "����� ����������"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "����"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "���� �����צ�"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "��������� ���ϧ ����"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "��������� צ����������"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "�'������"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "������"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "ͦ����"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "�������� 1 �������"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "���������� ����Ҧަ"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "�������� ��������"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "�������� ��������"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "��������"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "����"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "�������� �������"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "�� ������� �Φæ�̦������ �������� Evolutuion."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "�������æ"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "��������� ����Ҧ�"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "��������Φ ����"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "�������æ� Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "�����Φ�� \"������\" ��� ���������� �����, �� \"���ͦ����\" ��� �����."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "�� ������� �������� �������� �����"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "����� Evolution ����� �����������."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "����� �� ��� ������ ������ Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7006,16 +9443,14 @@ msgstr ""
 "%s\n"
 "�������: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"��������� �������� ����� �\n"
-"\"%s\"."
+msgstr "������� ������� � ��� ���������� �����."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7023,7 +9458,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7031,19 +9475,58 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell.c:379
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "�� ������� �������� ����: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"��������� �������� ����� �\n"
+"\"%s\"."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1249
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "�������� � ����"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "��������� � ����"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "������ ��������"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "�� ������Φ, �� ������ ������ �������� \"%s\"?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "����������� ���� %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7052,200 +9535,424 @@ msgstr ""
 "��������� �������� ������� ����:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "������� ����� ���� �� צ���."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ��������� ���ϧ ����"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: 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:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "�����..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(��������������)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
-#: shell/e-shell-view.c:1184
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:352
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "����� ���ϧ �����������æ� �� %s."
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "������������"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "������� ���������� �����: %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "������� ������������ %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "������¦�"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "����� �����:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "������� ����"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "��� �����:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "��¦� ����"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� �������� �� ������ �������� � $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "�� ������� ��������� Bug buddy"
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "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:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "������� �� ����..."
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "�������� ����� �������"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "�����������"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "�����������"
+
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr ""
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "����� �����:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "�� ��������"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "����צ������ ��� �����"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "����צ������ ��� �����"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "��̦ Ц��������"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "���������� ����˦ �� ��̦ Ц��������"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "����˦ Ц��������"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "���������� ����˦ �� ����˦ Ц��������"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "���� �����..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "�������� �� �����..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "����צ������ ��� �����"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "�������� �� �����..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "����צ������ ��� �����"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "���������� ����˦ �� ����˦ Ц��������"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "���������� ����˦ �� ����˦ Ц��������"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "����צ������"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "����צ������ ��� �����"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "����צ������ ��� �����"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "��������"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "�������� � ������ צ�Φ"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "�������� ������� ��צ�������� � ������ צ�Φ"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "����� �������: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
 msgstr "����צ������ ��� �����"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr ""
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "������ ����˦�"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "�������"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(��� �����)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "��� �������"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "�������� �������"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "���� � æ�� ������ ��� ���դ"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "�������� ��� ���� �� צ����"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "������� �����/������"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "�� �������� ͦ��� ��� ��������� ����"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "������ϧ ���� �� ��������"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "�����æ� �� Ц�����դ����"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "���"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "�������� ������� ����"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% ����������:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "����-��� ���� ͦ�����"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "����'����:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
@@ -7262,93 +9969,6 @@ msgstr "����"
 msgid "Specify where to create the folder:"
 msgstr "�� �������� ͦ��� ��� ��������� ����"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "�� ������� �Φæ�̦������ �������� Evolutuion."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "����� ���ϧ �����������æ� �� %s."
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "������������"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "������� ���������� �����: %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "������� ������������ %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: shell/importer/importer.c:473
-#, fuzzy
-msgid "Automatic"
-msgstr "������¦�"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "����� �����:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "������� ����"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "��� �����:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "������"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7370,276 +9990,370 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "������"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "�� ��������"
+
+#: shell/importer/intelligent.c:199
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "����� �� ���������� �� ��צ��������."
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\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:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "�� ������� �Φæ�̦������ �������� Evolutuion."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�� ������� �Φæ�̦������ ����������� ������� Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "��������"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "�������� �������"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "�������� ����� �������"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "������ �������"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "�������� ����� �������"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "������"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "��Ҧ����"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "������ �������"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "��Ҧ���� �������"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "������ �������"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "����� �������"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "����������� ��צ��������, �� ���� �����������"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "�����"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "��������"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "�������� ����� ��ͦ��"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "����������� ��������, �� ���� �����������"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "����������� ��������"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "������� ���"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "������ �������"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "��������"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "�������� ������������"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "�������� ���"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "�������� �Ӧ ��������"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "������ �������"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "�������"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "�������"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "���������..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "����� ������Ԧ�"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "������� ���"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "�����������"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 �Φ�"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "Alter preferences"
-msgstr "��������� ���������"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "�������� ����� ��������"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "�������� ���� ����Ҧ�"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "�������� ����� ��������"
+msgid "Create a new appointment"
+msgstr "�������� ���� ����Ҧ�"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "����"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "�������"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "������� ����� � ��Ӧ"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "������� ������ � ��Ӧ"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "������ ����"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "������Φ"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "������� �� ������ϧ ����"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "��������� � ������ ���"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "������"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "���� ��Ħ�"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "�������� ��������"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "�����"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "���� ����Ҧ�"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "����������� ��������, �� ���� �����������"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "����������� ��������"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "����������� ��� ��������"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "�������� ��"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "����� �������æ�"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "�������� �������� �� ���� ����"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "�������� 1 ����"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "�������� 1 ͦ����"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "�������� 1 �������"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "�������� ������� �������"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "������Φ"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "������� �������"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "�������"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "����Ҧަ"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "��������� �����..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "����"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "������"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "�����"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "�������� ��������"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Week"
 msgstr "�������"
 
+#: 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:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "�������"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "������� �� ����Ҧ�"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "������ �� ����Ҧ�"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "������� ������ ���������Ԧ�"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "����������� ��צ��������, �� ���� �����������"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "�������� �����"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "��������� �����"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "����������� ��� �������"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "���������..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "�������� �� �������"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "�������� ������� � ������� Ħ����"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "䦧"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "����"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "������ ��� �������"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "������..."
 
@@ -7651,27 +10365,12 @@ msgstr "��צ���"
 msgid "Print En_velope..."
 msgstr "����������� �������..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "����������� ��� �������"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "���������..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "�������� ��..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "�������� �� �������"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "�������� ������� � ������� Ħ����"
@@ -7689,911 +10388,1019 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "��Ħ����� ��צ�������� �� ���������..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "����"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "��������"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "��� �� ��������"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "������ ��� �������"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "���..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "�������� ������� � ������� Ħ����"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "䦧"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "��Ħ����� ������� ������..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "������� �����..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "��Ħ����� ��צ�������� �� ���������..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "��������"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "��������� ����Ҧ�"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "��Ҧ����"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "�ͦ���� ���������Ԧ æ�� ����"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "��������"
+msgid "Forward as i_Calendar"
+msgstr "������������ ���������"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "��������"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "��������� �� ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "�������� �������"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "������� �� ����Ҧ�"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "���������� ����Ҧަ"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "�������� � ����..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "��������� ����Ҧ�"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "��������"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "���������� ����Ҧަ"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "�������� �������"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "䦧"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "��Ҧ����"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "��Ҧ���� �������"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "���ͦ����"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "������ �� ����Ҧ�"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "�������� �������� ����"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "����������"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "������� ���� ��צ��������"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "������ ������� � ��æ"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "���������"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "���������� �ͦ����"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "������ ����̦"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "������� �� ���������� ��������"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "��������� ������������..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "������� �� ������������ ��������"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "���������� ��������"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "��������� ��צ�������� � ���� ����"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "���� ���������"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "���������"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "��Ħ����� ��צ�������� � ����� �� �������� ��צ"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "��������"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "�������� ����� ��ͦ��"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "��������"
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "�������� צ��������� ���"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "�������� �����"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "������..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "��������� �����..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "��Ħ����� ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "��������� �����"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "��������� �����..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "��������"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "��������"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "�������� ������� � ������� Ħ����"
+msgid "_Send / Receive"
+msgstr "���� ���������"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "�������� �������� ����"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "�ͦ���� ���������Ԧ æ�� ����"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "��������� ����Ҧ�"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "������ �����Φ ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:47
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule some sort of a meeting"
-msgstr "���������� ����Ҧަ"
+msgid "Cut selected messages"
+msgstr "������ �����Φ ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "������� ���"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "�������� �����Φ ��צ��������"
+
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "�������� ����Ԧ ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "������� �����"
+msgid "Hide _Read Messages"
+msgstr "�������� �������Φ ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "��������� �Ӧ �����������"
+
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "��������"
+msgid "Mark all visible messages as read"
+msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "���..."
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "�������� ����� ��ͦ��"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "�������"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "��������� ��צ�������� � ���� ����"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "�������"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "������� ���"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "��������"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "������� Ǧ���"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "������������"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "��צ���"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "�������"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "������ �����Φ ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "���������� �����"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "�������� ���"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "�����Φ� ������� � ��æ"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "��Ħ����� ��צ��������"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "��������� � ����..."
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "������ �����Φ ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "���ͦ���"
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "��������� �� ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "��������"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "����������"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "����"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "����������� ��¦�"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "���������Ԧ..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "������� ���"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "��������"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "��������� �� ��צ��������"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "�������"
+msgid "Apply filter rules to the selected messages"
+msgstr "������ �����Φ ��צ��������"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "������ �������"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "�����צ��� �Ӧ� ����������� ����� ��צ��������"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "�������� ����� �������"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "�����צ��� צ��������� ����� ��צ��������"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "���Ц����� �����Φ ��צ�������� � ���� ����"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "���� �����"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "�������� צ�������� ���� � ��צ��������"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "�ͦ���� ���������Ԧ æ�� ����"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "����������"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "������� ���� ��צ��������"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "����������� ����..."
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "�������� צ�������� ���� � ��צ��������"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "���Ц����� ��צ�������� � ���� ����"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "�������� צ�������� ���� � ��צ��������"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "���Ц����� �����Φ ��צ�������� � ���� ����"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "�������� צ�������� ���� � ��צ��������"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
 msgstr "�������� צ�������� ���� � ��צ��������"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "�����צ��� צ��������� ����� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "������� �� ���������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "������ �����Φ ��צ��������"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "��������� ��צ��������"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "��������� ������� ��צ��������"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "������� �� ������������ ��צ��������"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "���������� �ͦ����"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "������� �� ������������ ��צ��������"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "����������"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "������� �� ������������ ��צ��������"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "����� ������ ��������"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "����� צ���������"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "����� ��������ަ�"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "����� ����"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "��������� �������� ����� צ�ͦ���� ��� ��������"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "������ ����̦"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "���������"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "��������� ��"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward inline"
-msgstr "���������"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
+msgid "Forward _Attached"
+msgstr "��������� ��"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "��������� ��צ�������� ��� ����"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "���Φ ���������"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "������� �� ���������� ��צ��������"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "������� �� ������������ ��צ��������"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "�������� ����Ԧ ��צ��������"
+msgid "Forward _Inline"
+msgstr "���������"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "�������� �����Φ ��צ��������"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "���������"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "�������� ����Ԧ ��צ��������"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "�������� �������Φ ��צ��������"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "����������� ��¦�"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "��������� ��צ�������� � ���� ����"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "��������� ������������..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "��������� �Ӧ �����������"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "�������Φ ��צ��������"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "��������� ����������"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "�������"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "��������� ������������"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "����������� ������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "����������� ������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "����������� ������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "���������"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "��������� ��צ�������� � ���� ����"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "��������� ��צ�������� � ���� ����"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "�������� � ������ צ�Φ"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "��̦"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "�������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "�������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "������� Ǧ���"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "�������� ��צ��������"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "�������� ������� ��צ�������� � ������ צ�Φ"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "�������� ����� ��צ��������..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "����������� ��צ�������� �� ������Ҧ"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "����������� ��צ��������, �� ���� �����������"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "����������� ��צ��������..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "�������Τ"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "�������������"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "�������Τ ��צ��������"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "�����צ��� �Ӧ�"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "�������Τ ��צ��������"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "�����צ��� צ���������"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "�������Τ ��צ��������"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "S_earch Message"
-msgstr "�������� ��צ��������:"
+msgid "Print Message..."
+msgstr "����������� ��צ��������..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "�������"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "�������� �����"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "�������� ��צ�������� � ������ ���̦"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "����������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "������� ���"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "�����צ���"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "������� Ǧ���"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "�����צ��� �Ӧ�"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Send / Receive"
-msgstr "���� ���������"
+msgid "S_earch Message"
+msgstr "�������� ��צ��������:"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "�������� ��צ�������� � ������ ���̦"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "��Ħ����� ��צ�������� � ����� �� �������� ��צ"
+msgid "Show Full _Headers"
+msgstr "���Φ ���������"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "��Ħ����� ��צ�������� � ����� �� �������� ��צ"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr ""
+"���� ���Ҧ��� ������� � ������ �����Ԧ: \n"
+"\n"
+"%s"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "�������� ���"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "�������� ��צ�������� � �����Φ� ��æ"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "��������� �� ��צ��������"
+msgid "Show the raw email source of the message"
+msgstr "�������� ���� �� ��צ��������"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "����������� ������� ��צ��������"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "���������"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "����� ������ ��������"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "���������� ���� צ���������"
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "�������� צ��������� ���"
+msgid "VFolder on _Recipients..."
+msgstr "���������� ���� ��������ަ�"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "���������� ���� ����"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "����������� Ʀ�����"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "���������"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "�������� � ����"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "�������� ������� � ��צ��������"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "����������"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "������..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "����"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "�������Φ ��צ��������"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "��������"
+msgid "_Message Display"
+msgstr "��צ��������"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "����������� ��¦�"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "��������� � ����"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "��Ħ����� ��צ��������"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "����"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "��������� �����..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "��Ħ����� ��צ�������� �����"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "�������� ��������"
+msgid "_Re-send Message"
+msgstr "��Ħ����� ��צ�������� �����"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "������� �� צ���"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "�����צ���"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "��Ħ����� ��צ�������� �����"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "�������� ��צ�������� ��..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:115
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "���� ���������"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "�������"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "���"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "������� �������� ����"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "������ �������"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "����������� �� ��צ�������� PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "������"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "�������� ��������� ����..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "�������� ���� �� ����� � ��צ��������"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "�������� ��������� ����..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "�������� ����"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "���������� PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "����� PGP"
 
 #: ui/evolution-message-composer.xml.h:17
 #, fuzzy
-msgid "Save _Draft"
-msgstr "��������"
+msgid "S/MIME Encrypt"
+msgstr "���������� PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "�������� � ��æ..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "��������"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "�������� ��"
+
+#: ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save _Draft"
+msgstr "��������"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "�������� � ��æ..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "�������� �������� ����"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "�������� �������� ���� � ����� ������"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "�������� ��צ�������� � �����Φ� ��æ"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "����������"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "���������� Ц�Φ��"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "���������� Ц�Φ��"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "��Ħ����� ����� � �����Ԧ HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "��Ħ����� ��צ�������� Ц�Φ��"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "��Ħ����� ��צ�������� �������"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "������ �� ��צ�������� �������"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "�������� / �������� ���������"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "�������� ���������"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "�������� ���������"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "�������� �� ��צ�������� ����� ������ PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "�������� �� ��צ�������� ����� ������ PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "����������� ���� ������ ����̦ ���"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "����������� ���� ������ ����̦ ���"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "����������� ���� ������ ����̦ ���"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "���������"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "������������"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "������"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "�������� ��������� ����..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "��������..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "�����צ���� ��:"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "�������"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "��צ���"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "������ ���� �� ������ ������ ������������� ���"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "����"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "������� ������"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "������� ������ ���"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "������������"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "��������� ����������"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "����'����� ��������"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "������ ��̦"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "���������"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "��������� צ�ͦ���� Ħ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "��ͦ����"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "��ͦ���� �����"
+msgid "Cancel Task"
+msgstr "���� ��������"
 
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "�����צ��� �Ӧ�"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "������ ��������"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "�������"
+msgid "Re_fresh Task"
+msgstr "������� ������"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "�������� ������� � ������� Ħ����"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "������ ������ ��� �� �����"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "����� �����"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "���ͦ����"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "���ͦ���� ������� �����æ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "����Ҧ�"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "��������� ���������"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "�����צ���"
+msgid "Copy selected task"
+msgstr "�������� ��������"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "�������� ���� ��������"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "������ ��������"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "������ ��������"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "���� ��������"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "�������� ����� ��ͦ��"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "�������� �������� �� ���� ����"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "��������� �������..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "��������� �����..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "��������"
 
@@ -8601,135 +11408,220 @@ msgstr "��������"
 msgid "About Evolution..."
 msgstr "��� Evolution..."
 
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "������ ����˦�"
+
 #: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "������� �� צ���"
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "�ͦ���� ���������Ԧ æ�� ����"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "�������� � ����"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr ""
+#: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "��������� ���ϧ ����"
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "��������� ���ϧ ����"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "������ ��� �������"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "����������� ���� ����"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "�����"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "����� Evolution"
 
-#: ui/evolution.xml.h:10
-#, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evolution - %s"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "����� � ��������"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "���������"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "������� ������ ���������Ԧ�"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "��������� ��צ�������� � ���� ����"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "�������� � ������ צ�Φ"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "�������� ������� ��צ�������� � ������ צ�Φ"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "�������� �������æ� ��� Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "���������� �צ� ��� �������"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "��Ħ����� �צ� ��� �������"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "��Ħ����� �צ� ��� ������� �������������� Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "��¦�����"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "����������� ���� ������ ����̦ ���"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "����������� ���� ������ ����̦ ���"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "����������� ���� ������ ����̦ ���"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "������������ ��������� ������Ԧ�"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "������������ ���������"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "������������ ������ϧ ��������"
 
-#: ui/evolution.xml.h:24
-#, fuzzy
-msgid "Work Offline"
-msgstr "�����������"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "�������� ������� ����"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "��� Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "䦧"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "����Ҧ�"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "�������"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "��������"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "������ ���"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "������� �� ����..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "����������� ����..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "��������"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "������� ��צ��������"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "���������"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "�����"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "���� ����"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "��������..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "������ ����˦�"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "������ ����˦�"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "��������"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "�����������"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "��������� �����..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "�����Φ ������"
 
 #: views/addressbook/galview.xml.h:2
@@ -8763,9 +11655,12 @@ msgstr ""
 "\n"
 "������Ҧ�: "
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8839,42 +11734,34 @@ msgstr "��� ���������� ڦ������:"
 msgid "All Attendees"
 msgstr "���� �����צ�"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "�������� Ҧ� (%Y)"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 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:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "�������"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "�����"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "������Φ"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "������"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8882,22 +11769,108 @@ msgstr ""
 "\n"
 "%s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "�������"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "��������"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "����Φ��æ�"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "�����"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "��צ���� �������: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "����"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "�������� ������Ԧ�"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "�����"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "������������� �����"
 
-#: widgets/misc/e-filter-bar.c:317
-#, fuzzy
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "�������� ���"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "���������..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8908,6 +11881,11 @@ msgstr "�������æ�"
 msgid "Warning"
 msgstr "������������"
 
+#: widgets/misc/e-messagebox.c:166
+#, fuzzy
+msgid "Error"
+msgstr "��� �������"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "�������"
@@ -8921,7 +11899,7 @@ msgstr "��צ��������"
 msgid "Don't show this message again."
 msgstr "����� �� ���������� �� ��צ��������."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "�����"
 
@@ -8944,3 +11922,522 @@ msgstr "init_corba(): �� ������� �Φæ�̦������ GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� �Φæ�̦������ Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "��������� ���������"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "��������� �������..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "��'����..."
+
+#~ msgid "_Company:"
+#~ msgstr "������:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "�� _Minicards"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "������..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Open calendar"
+#~ msgstr "�������� ��������"
+
+#~ msgid "Save calendar"
+#~ msgstr "�������� ��������"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>������� ������������ ���������:<br>����� �� Ц�����դ����"
+
+#~ msgid "Colors"
+#~ msgstr "�������"
+
+#~ msgid "Highlight"
+#~ msgstr "���צ���"
+
+#~ msgid "TaskPad"
+#~ msgstr "������ �������"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "�������Φ �ɭ����"
+
+#~ msgid "Work week"
+#~ msgstr "������� �������"
+
+#~ msgid "Edit Task"
+#~ msgstr "��������� ��������"
+
+#~ msgid "Percent complete"
+#~ msgstr "�������� ���������"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "��������� �������� �� ��������"
+
+#~ msgid "Edit this task..."
+#~ msgstr "��������� �� ��������..."
+
+#~ msgid "Edit the task"
+#~ msgstr "��������� ��������"
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "������Φ"
+
+#, fuzzy
+#~ msgid "Component successfully updated."
+#~ msgstr "����� Evolution ����� �����������."
+
+#, fuzzy
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "�� ������� �������� �������� � \"%s\""
+
+#, fuzzy
+#~ msgid "Component successfully deleted."
+#~ msgstr "����� Evolution ����� �����������."
+
+#, fuzzy
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "������ �� ���������"
+
+#~ msgid "Update Calendar"
+#~ msgstr "�������� ��������"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "���� �����צ�"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "���� �����צ�"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "���������\n"
+#~ "����Ҧ�"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "�Ҧ����æ�:"
+
+#~ msgid "Show a dialog"
+#~ msgstr "�������� Ħ����"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "������� ����Ҧަ"
+
+#~ msgid "_Starting date:"
+#~ msgstr "���� �������:"
+
+#~ msgid "label21"
+#~ msgstr "label26"
+
+#~ msgid "label55"
+#~ msgstr "label26"
+
+#~ msgid "Summary contains"
+#~ msgstr "�������� ͦ�����"
+
+#~ msgid "Comment contains"
+#~ msgstr "�������� ͦ�����"
+
+#, fuzzy
+#~ msgid "Has category"
+#~ msgstr ""
+#~ "\n"
+#~ "������Ҧ�: "
+
+#, fuzzy
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "�������� ����� ��������"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "���������� ��� � \"%s\""
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "�������� ������� ����"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "��Ħ����� \"%s\""
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "�� ������� צ������ ���� Ц����� %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "�� �� ��������� ����."
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "��������� צ������ ���� %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "��������� ����� � %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "��������� � ����"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "������� �� ������������ ��������"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "������� �� ���������� ��������"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "��Ħ��"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "�� ������� �Φæ�̦������ �������� ��������� Evolutuion."
+
+#~ msgid "Forward to Address"
+#~ msgstr "��������� �� ������"
+
+#~ msgid "Closing current folder"
+#~ msgstr "���������� ������ϧ ����"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "�������������� ����ϧ ���� �� צ���������"
+
+#~ msgid "Copying messages"
+#~ msgstr "��Ц������ ��צ�������"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "��������� ��צ�������� %d � %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "�������� ��צ�������� � �����Φ� ��æ"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (��������� ��צ��������)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (��� ����)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "��������� ��צ�������� (��� ����)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "����������� ������� ��צ��������"
+
+#~ msgid "Delete this message"
+#~ msgstr "������ �� ��צ��������"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "����� Evolution ����� �����������."
+
+#~ msgid "Activate"
+#~ msgstr "����צ������"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "����צ������ ��� �����"
+
+#~ msgid "Find a contact"
+#~ msgstr "������ �������"
+
+#~ msgid "View All"
+#~ msgstr "�������� ���"
+
+#~ msgid "View all contacts"
+#~ msgstr "�������� �Ӧ ��������"
+
+#~ msgid "5 Days"
+#~ msgstr "5 �Φ�"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "�������� ����� ��������"
+
+#~ msgid "Day"
+#~ msgstr "����"
+
+#~ msgid "New _Event"
+#~ msgstr "���� ��Ħ�"
+
+#~ msgid "Open Calendar"
+#~ msgstr "�������� ��������"
+
+#~ msgid "Prev"
+#~ msgstr "�����"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "�������� �������� �� ���� ����"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "�������� ��������"
+
+#~ msgid "About this application"
+#~ msgstr "��� �� ��������"
+
+#~ msgid "About..."
+#~ msgstr "���..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "䦧"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "������� �����..."
+
+#~ msgid "C_lear"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "��������"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "�������� � ����..."
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "������ ������� � ��æ"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "���������"
+
+#~ msgid "Go to the next item"
+#~ msgstr "������� �� ���������� ��������"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "������� �� ������������ ��������"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "���������� ��������"
+
+#~ msgid "N_ext"
+#~ msgstr "���������"
+
+#~ msgid "Pre_vious"
+#~ msgstr "��������"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "��������� �����..."
+
+#, fuzzy
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "���������� ����Ҧަ"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "������� �����"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "��������"
+
+#~ msgid "_About..."
+#~ msgstr "���..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "�������"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "���������� �����"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "�����Φ� ������� � ��æ"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "��Ħ����� ��צ��������"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "��������� � ����..."
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "���ͦ���"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "������ �������"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "�������� ����� �������"
+
+#~ msgid "New Mail"
+#~ msgstr "���� �����"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "����������� ����..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "���Ц����� ��צ�������� � ���� ����"
+
+#~ msgid "Edit the current message"
+#~ msgstr "��������� ������� ��צ��������"
+
+#~ msgid "Expunge"
+#~ msgstr "����������"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "��������� �������� ����� צ�ͦ���� ��� ��������"
+
+#, fuzzy
+#~ msgid "Forward inline"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "��������� ��צ�������� ��� ����"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "�������� ����Ԧ ��צ��������"
+
+#~ msgid "Invert Selection"
+#~ msgstr "����������� ��¦�"
+
+#~ msgid "Mark As Read"
+#~ msgstr "��������� ����������"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "��������� ������������"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "��������� ��צ�������� � ���� ����"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "�������� ����� ��צ��������..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "����������� ��צ�������� �� ������Ҧ"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "�������������"
+
+#~ msgid "Reply to all"
+#~ msgstr "�����צ��� �Ӧ�"
+
+#~ msgid "Reply to sender"
+#~ msgstr "�����צ��� צ���������"
+
+#~ msgid "S_ource"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "��Ħ����� ��צ�������� � ����� �� �������� ��צ"
+
+#~ msgid "_Reply"
+#~ msgstr "�����צ���"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "�������� ��צ�������� ��..."
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "�������� � ��æ..."
+
+#~ msgid "Send the message now"
+#~ msgstr "��Ħ����� ��צ�������� �������"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "�������� ��������� ����..."
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "����'����� ��������"
+
+#~ msgid "Redo"
+#~ msgstr "���������"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "��������� צ�ͦ���� Ħ�"
+
+#~ msgid "Replace"
+#~ msgstr "��ͦ����"
+
+#~ msgid "Replace a string"
+#~ msgstr "��ͦ���� �����"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "�����צ��� �Ӧ�"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "�������"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "������ ������ ��� �� �����"
+
+#~ msgid "Search for a string"
+#~ msgstr "����� �����"
+
+#~ msgid "Undo"
+#~ msgstr "���ͦ����"
+
+#~ msgid "Undo the last action"
+#~ msgstr "���ͦ���� ������� �����æ�"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "��������� ���������"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "�����צ���"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution - %s"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "���������..."